From a8b07fffc8682f594f1e8120cb51bf49a1b3c603 Mon Sep 17 00:00:00 2001
From: xaver <xaver@ispconfig3>
Date: Fri, 23 Mar 2012 00:31:33 -0400
Subject: [PATCH] php 5.4 fixes + bugfix interface/web/admin/list/remote_user.list.php ['table_idx'] from userid to remote_userid
---
interface/lib/classes/getconf.inc.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index a2be834..1882061 100644
--- a/interface/lib/classes/getconf.inc.php
+++ b/interface/lib/classes/getconf.inc.php
@@ -35,7 +35,7 @@
public function get_server_config($server_id, $section = '') {
global $app;
- if(!is_array($this->config[$server_id])) {
+ if(!isset($this->config[$server_id])) {
$app->uses('ini_parser');
$server_id = intval($server_id);
$server = $app->db->queryOneRecord('SELECT config FROM server WHERE server_id = '.$server_id);
@@ -47,10 +47,12 @@
public function get_global_config($section = '') {
global $app;
- if(!is_array($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];
}
--
Gitblit v1.9.1