From ad955792a8ade5c0015aa3d68f86b1035c1acc31 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 22 Jan 2014 11:30:52 -0500
Subject: [PATCH] Fixed bug from previous commit
---
server/lib/classes/getconf.inc.php | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/server/lib/classes/getconf.inc.php b/server/lib/classes/getconf.inc.php
index c2207a1..c5ca6c6 100644
--- a/server/lib/classes/getconf.inc.php
+++ b/server/lib/classes/getconf.inc.php
@@ -31,7 +31,7 @@
class getconf {
var $config;
-
+
function get_server_config($server_id, $section = '') {
global $app;
@@ -41,24 +41,25 @@
$server = $app->db->queryOneRecord('SELECT config FROM server WHERE server_id = '.$server_id);
$this->config[$server_id] = $app->ini_parser->parse_ini_string(stripslashes($server['config']));
}
-
+
if($section == '') {
return $this->config[$server_id];
} else {
return $this->config[$server_id][$section];
}
}
-
+
public function get_global_config($section = '') {
global $app;
-
- if(!is_array($this->config['global'])) {
+
+ if(!@is_array($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']));
}
return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
}
+
}
?>
--
Gitblit v1.9.1