- Fixed FS#2182.

falkotimme · falkotimme · commit 96167745a6b1 · 2012-04-24T14:45:17.000Z
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
@@ -47,12 +47,10 @@ public function get_server_config($server_id, $section = '') {
 	public function get_global_config($section = '') {
 		global $app;
 		
-		if(isset($this->config['global'])) {
+		if(!isset($this->config['global'])) {
 			$app->uses('ini_parser');
 			$tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
 			$this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp['config']));
-		} else {
-			$this->config['global'] = NULL;
 		}
 		return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
 	}

Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,10 @@ public function get_server_config($server_id, $section = '') {`
`47`	`47`	`public function get_global_config($section = '') {`
`48`	`48`	`global $app;`
`49`	`49`
`50`		`- if(isset($this->config['global'])) {`
	`50`	`+ if(!isset($this->config['global'])) {`
`51`	`51`	`$app->uses('ini_parser');`
`52`	`52`	`$tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');`
`53`	`53`	`$this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp['config']));`
`54`		`- } else {`
`55`		`- $this->config['global'] = NULL;`
`56`	`54`	`}`
`57`	`55`	`return ($section == '') ? $this->config['global'] : $this->config['global'][$section];`
`58`	`56`	`}`