From 341ef7175af7c8f21d27262b58da8f5bc2c06ef0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 08:44:59 -0400
Subject: [PATCH] Merge branch 'master_fixes' into 'master'
---
interface/lib/classes/getconf.inc.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index ad2a302..45fefa6 100644
--- a/interface/lib/classes/getconf.inc.php
+++ b/interface/lib/classes/getconf.inc.php
@@ -31,7 +31,7 @@
class getconf {
private $config;
-
+
public function get_server_config($server_id, $section = '') {
global $app;
@@ -43,10 +43,10 @@
}
return ($section == '') ? $this->config[$server_id] : $this->config[$server_id][$section];
}
-
+
public function get_global_config($section = '') {
global $app;
-
+
if(!isset($this->config['global'])) {
$app->uses('ini_parser');
$tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
@@ -54,6 +54,7 @@
}
return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
}
+
}
?>
--
Gitblit v1.9.1