|
|
@@ -1143,7 +1143,7 @@ function parse_bbc($message, $smileys = true, $cache_id = '', $parse_tags = arra
|
|
|
'tag' => 'flash',
|
|
|
'type' => 'unparsed_commas_content',
|
|
|
'test' => '\d+,\d+\]',
|
|
|
- 'content' => (isBrowser('ie') && !isBrowser('mac_ie') ? '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="$2" height="$3"><param name="movie" value="$1" /><param name="play" value="true" /><param name="loop" value="true" /><param name="quality" value="high" /><param name="AllowScriptAccess" value="never" /><embed src="$1" width="$2" height="$3" play="true" loop="true" quality="high" AllowScriptAccess="never" /><noembed><a href="$1" target="_blank" class="new_win">$1</a></noembed></object>' : '<embed type="application/x-shockwave-flash" src="$1" width="$2" height="$3" play="true" loop="true" quality="high" AllowScriptAccess="never" /><noembed><a href="$1" target="_blank" class="new_win">$1</a></noembed>'),
|
|
|
+ 'content' => (isBrowser('ie') ? '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="$2" height="$3"><param name="movie" value="$1" /><param name="play" value="true" /><param name="loop" value="true" /><param name="quality" value="high" /><param name="AllowScriptAccess" value="never" /><embed src="$1" width="$2" height="$3" play="true" loop="true" quality="high" AllowScriptAccess="never" /><noembed><a href="$1" target="_blank" class="new_win">$1</a></noembed></object>' : '<embed type="application/x-shockwave-flash" src="$1" width="$2" height="$3" play="true" loop="true" quality="high" AllowScriptAccess="never" /><noembed><a href="$1" target="_blank" class="new_win">$1</a></noembed>'),
|
|
|
'validate' => create_function('&$tag, &$data, $disabled', '
|
|
|
if (isset($disabled[\'url\']))
|
|
|
$tag[\'content\'] = \'$1\';
|
|
|
@@ -2905,8 +2905,6 @@ function setupThemeContext($forceload = false)
|
|
|
// If we've upgraded recently, go easy on the passwords.
|
|
|
if (!empty($modSettings['disableHashTime']) && ($modSettings['disableHashTime'] == 1 || time() < $modSettings['disableHashTime']))
|
|
|
$context['disable_login_hashing'] = true;
|
|
|
- elseif (isBrowser('ie5') || isBrowser('ie5.5'))
|
|
|
- $context['disable_login_hashing'] = true;
|
|
|
}
|
|
|
|
|
|
// Setup the main menu items.
|
|
|
@@ -2941,7 +2939,7 @@ function setupThemeContext($forceload = false)
|
|
|
var smf_avatarMaxWidth = ' . (int) $modSettings['avatar_max_width_external'] . ';
|
|
|
var smf_avatarMaxHeight = ' . (int) $modSettings['avatar_max_height_external'] . ';';
|
|
|
|
|
|
- if (!isBrowser('ie') && !isBrowser('mac_ie'))
|
|
|
+ if (!isBrowser('ie'))
|
|
|
$context['html_headers'] .= '
|
|
|
window.addEventListener("load", smf_avatarResize, false);';
|
|
|
else
|
Spuds