Don't use ['html_headers'] to add JS (per #339)

Signed-off-by: Michael Eshom <[email protected]>

Sources/Subs-Editor.php

@@ -1945,8 +1945,7 @@ function create_control_verification(&$verificationOptions, $do_test = false)
 
 		// Some javascript ma'am?
 		if (!empty($verificationOptions['override_visual']) || (!empty($modSettings['visual_verification_type']) && !isset($verificationOptions['override_visual'])))
-			$context['html_headers'] .= '
-		<script type="text/javascript" src="' . $settings['default_theme_url'] . '/scripts/captcha.js"></script>';
+			loadJavascriptFile('captcha.js', array('default_theme' => true));
 
 		$context['use_graphic_library'] = in_array('gd', get_loaded_extensions());
 

Sources/Subs.php

@@ -2916,21 +2916,16 @@ function setupThemeContext($forceload = false)
 	if ($modSettings['avatar_action_too_large'] == 'option_js_resize' && (!empty($modSettings['avatar_max_width_external']) || !empty($modSettings['avatar_max_height_external'])))
 	{
 		// @todo Move this over to script.js?
-		$context['html_headers'] .= '
-	<script type="text/javascript"><!-- // --><![CDATA[
-		var smf_avatarMaxWidth = ' . (int) $modSettings['avatar_max_width_external'] . ';
-		var smf_avatarMaxHeight = ' . (int) $modSettings['avatar_max_height_external'] . ';';
+		addJavascriptVar('smf_avatarMaxWidth', (int) $modSettings['avatar_max_width_external']);
+		addJavascriptVar('smf_avatarMaxHeight', (int) $modSettings['avatar_max_height_external']);
 
 		if (!isBrowser('ie'))
-			$context['html_headers'] .= '
-	window.addEventListener("load", smf_avatarResize, false);';
+			addInlineJavascript('window.addEventListener("load", smf_avatarResize, false);');
 		else
-			$context['html_headers'] .= '
-	var window_oldAvatarOnload = window.onload;
-	window.onload = smf_avatarResize;';
-
-		$context['html_headers'] .= '
-	// ]]></script>';
+		{
+			addJavascriptVar('window_oldAvatarOnload', 'window.onload');
+			addInlineJavascript('window.onload = smf_avatarResize;');
+		}
 	}
 
 	// This looks weird, but it's because BoardIndex.php references the variable.
@@ -2949,10 +2944,7 @@ function setupThemeContext($forceload = false)
 	$context['common_stats']['boardindex_total_posts'] = sprintf($txt['boardindex_total_posts'], $context['common_stats']['total_posts'], $context['common_stats']['total_topics'], $context['common_stats']['total_members']);
 
 	if (empty($settings['theme_version']))
-		$context['html_headers'] .= '
-	<script type="text/javascript"><!-- // --><![CDATA[
-		var smf_scripturl = "' . $scripturl . '";
-	// ]]></script>';
+		addJavascriptVar('smf_scripturl', $scripturl);
 
 	if (!isset($context['page_title']))
 		$context['page_title'] = '';