Index: branches/5.2.x/core/kernel/globals.php =================================================================== diff -u -N -r16415 -r16435 --- branches/5.2.x/core/kernel/globals.php (.../globals.php) (revision 16415) +++ branches/5.2.x/core/kernel/globals.php (.../globals.php) (revision 16435) @@ -1,6 +1,6 @@ \n" ) { - // format of "config.php" file before 5.1.0 version - array_shift($contents); - - return parse_ini_string(implode('', $contents), $parse_section); - } - - $_CONFIG = Array (); - require($file); - - if ( $parse_section ) { - if ( isset($_CONFIG['Database']['LoadBalancing']) && $_CONFIG['Database']['LoadBalancing'] ) { - require FULL_PATH . DIRECTORY_SEPARATOR . 'system' . DIRECTORY_SEPARATOR . 'db_servers.php'; - } - - return $_CONFIG; - } - - $ret = Array (); - - foreach ($_CONFIG as $section => $section_variables) { - $ret = array_merge($ret, $section_variables); - } - - return $ret; + return $system_config; } /** - * Returns parsed variables from "config.php" file - * - * @return Array - * @access public - */ - public static function getConfigVars() - { - static $vars = NULL; - - if ( !isset($vars) ) { - $vars = self::parseConfig(); - } - - return $vars; - } - - /** * Same as "include_once", but also profiles file includes in debug mode and DBG_PROFILE_INCLUDES constant is set * * @param string $file