From 93fdfe3a3cdd3b385a6a9ef74e91c9616b01390b Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 21 Jan 2015 04:13:28 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/lib/classes/getconf.inc.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index 0cc282e..a246b18 100644
--- a/interface/lib/classes/getconf.inc.php
+++ b/interface/lib/classes/getconf.inc.php
@@ -63,10 +63,10 @@
if(is_array($this->security_config)) {
return ($section == '') ? $this->security_config : $this->security_config[$section];
} else {
- $this->uses('ini_parser');
+ $app->uses('ini_parser');
$security_config_path = '/usr/local/ispconfig/security/security_settings.ini';
if(!is_file($security_config_path)) $security_config_path = realpath(ISPC_ROOT_PATH.'/../security/security_settings.ini');
- $this->security_config = $this->ini_parser->parse_ini_string(file_get_contents($security_config_path));
+ $this->security_config = $app->ini_parser->parse_ini_string(file_get_contents($security_config_path));
return ($section == '') ? $this->security_config : $this->security_config[$section];
}
--
Gitblit v1.9.1