Fix #12006: Mantis Graphs - Configuration - jpgraph library path not saved

atrol · atrol · commit 2e1bb5bdfc99 · 2012-02-26T21:53:00.000+01:00
diff --git a/config_defaults_inc.php b/config_defaults_inc.php
@@ -4108,39 +4108,24 @@
 
 /**
  * The following list of variables should never be in the database.
- * These patterns will be concatenated and used as a regular expression
- * to bypass the database lookup and look here for appropriate global settings.
+ * It is used to bypass the database lookup and look here for appropriate global settings.
  * @global array $g_global_settings
  */
 $g_global_settings = array(
-	'global_settings',
-	'admin_checks',
-	'allow_signup',
-	'anonymous',
-	'compress_html',
-	'content_expire',
-	'cookie',
-	'crypto_master_salt',
-	'custom_headers',
-	'database_name',
-	'^db_',
-	'display_errors',
-	'form_security_',
-	'hostname',
-	'html_valid_tags',
-	'language',
-	'login_method',
-	'plugins_enabled',
-	'plugins_installed',
-	'session_',
-	'show_detailed_errors',
-	'show_queries_',
-	'stop_on_errors',
-	'use_javascript',
-	'version_suffix',
-	'[^_]file[(_(?!threshold))$]',
-	'[^_]path[_$]',
-	'_page$',
-	'_table$',
-	'_url$',
+	'global_settings', 'admin_checks', 'allow_signup', 'allow_anonymous_login',
+	'anonymous_account', 'compress_html', 'content_expire', 'cookie_time_length', 'cookie_path',
+	'cookie_domain', 'cookie_version', 'cookie_prefix',	'string_cookie', 'project_cookie',
+	'view_all_cookie', 'manage_cookie', 'logout_cookie', 'bug_list_cookie', 'crypto_master_salt',
+	'custom_headers', 'database_name', 'db_username', 'db_password', 'db_schema', 'db_type',
+	'db_table_prefix','db_table_suffix', 'display_errors', 'form_security_validation',
+	'hostname','html_valid_tags', 'html_valid_tags_single_line', 'default_language',
+	'language_auto_map', 'fallback_language', 'login_method', 'plugins_enabled', 'session_handler',
+	'session_save_path', 'session_validation', 'show_detailed_errors', 'show_queries_count',
+	'stop_on_errors',	'use_javascript', 'version_suffix',	'custom_strings_file',
+	'file_upload_ftp_server', 'file_upload_ftp_user', 'file_upload_ftp_pass',
+	'fileinfo_magic_db_file', 'css_include_file', 'css_rtl_include_file', 'meta_include_file',
+	'file_type_icons', 'path', 'icon_path', 'short_path', 'absolute_path', 'core_path',
+	'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',
 );
diff --git a/core/config_api.php b/core/config_api.php
@@ -430,9 +430,9 @@ function config_can_set_in_database( $p_option ) {
 
 	# bypass table lookup for certain options
 	if( $g_cache_can_set_in_database == '' ) {
-		$g_cache_can_set_in_database = '/' . implode( '|', config_get_global( 'global_settings' ) ) . '/';
+		$g_cache_can_set_in_database = config_get_global( 'global_settings' );
 	}
-	$t_bypass_lookup = ( 0 < preg_match( $g_cache_can_set_in_database, $p_option ) );
+	$t_bypass_lookup = in_array( $p_option, $g_cache_can_set_in_database, true );
 
 	$g_cache_bypass_lookup[$p_option] = $t_bypass_lookup;
 

Original file line number	Diff line number	Diff line change
`@@ -430,9 +430,9 @@ function config_can_set_in_database( $p_option ) {`
`430`	`430`
`431`	`431`	`# bypass table lookup for certain options`
`432`	`432`	`if( $g_cache_can_set_in_database == '' ) {`
`433`		`- $g_cache_can_set_in_database = '/' . implode( '\|', config_get_global( 'global_settings' ) ) . '/';`
	`433`	`+ $g_cache_can_set_in_database = config_get_global( 'global_settings' );`
`434`	`434`	`}`
`435`		`- $t_bypass_lookup = ( 0 < preg_match( $g_cache_can_set_in_database, $p_option ) );`
	`435`	`+ $t_bypass_lookup = in_array( $p_option, $g_cache_can_set_in_database, true );`
`436`	`436`
`437`	`437`	`$g_cache_bypass_lookup[$p_option] = $t_bypass_lookup;`
`438`	`438`