Mark cdn_enabled as global setting

Issue #19932
mantisbt · Aug 19, 2015 · aa9b4f8 · aa9b4f8
1 parent 958d28b
commit aa9b4f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/config_defaults_inc.php b/config_defaults_inc.php
@@ -4258,6 +4258,7 @@
 	'class_path','library_path', 'language_path', 'absolute_path_default_upload_folder',
 	'ldap_simulation_file_path', 'plugin_path', 'bottom_include_page', 'top_include_page',
 	'default_home_page', 'logout_redirect_page', 'manual_url', 'logo_url', 'wiki_engine_url',
+	'cdn_enabled'
 );
 
 # Temporary variables should not remain defined in global scope

diff --git a/core/html_api.php b/core/html_api.php
@@ -366,7 +366,7 @@ function html_css() {
 	global $g_stylesheets_included;
 	html_css_link( config_get( 'css_include_file' ) );
 
-	if ( config_get( 'cdn_enabled' ) == ON ) {
+	if ( config_get_global( 'cdn_enabled' ) == ON ) {
 		echo '<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/' . JQUERY_UI_VERSION . '/themes/smoothness/jquery-ui.css">' . "\n";
 	} else {
 		html_css_link( 'jquery-ui-' . JQUERY_UI_VERSION . '.min.css' );
@@ -446,7 +446,7 @@ function html_head_javascript() {
 	echo "\t" . '<script type="text/javascript" src="' . helper_mantis_url( 'javascript_config.php' ) . '"></script>' . "\n";
 	echo "\t" . '<script type="text/javascript" src="' . helper_mantis_url( 'javascript_translations.php' ) . '"></script>' . "\n";
 
-	if ( config_get( 'cdn_enabled' ) == ON ) {
+	if ( config_get_global( 'cdn_enabled' ) == ON ) {
 		echo "\t" . '<script src="https://ajax.googleapis.com/ajax/libs/jquery/' . JQUERY_VERSION . '/jquery.min.js"></script>' . "\n";
 		echo "\t" . '<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/' . JQUERY_UI_VERSION . '/jquery-ui.min.js"></script>' . "\n";
 	} else {

diff --git a/core/http_api.php b/core/http_api.php
@@ -166,7 +166,7 @@ function http_security_headers() {
 		$t_script_src = "script-src 'self'";
 
 		# White list the CDN urls (if enabled)
-		if ( config_get( 'cdn_enabled' ) == ON ) {
+		if ( config_get_global( 'cdn_enabled' ) == ON ) {
 			$t_cdn_url = 'https://ajax.googleapis.com';
 			$t_style_src .= " $t_cdn_url";
 			$t_script_src .= " $t_cdn_url";