From 03e1700a01dd3b425ec5d6cb7bd9684360900a53 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 07 Jun 2012 06:59:07 -0400
Subject: [PATCH] FS#1814 - Add option for custom php.ini for execution of ispconfig server.php script
---
interface/lib/classes/getconf.inc.php | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index 1882061..12059ac 100644
--- a/interface/lib/classes/getconf.inc.php
+++ b/interface/lib/classes/getconf.inc.php
@@ -47,12 +47,10 @@
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];
}
--
Gitblit v1.9.1