From bfd02591c86fe587f74ad74d77d9b86bc9ea9891 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 25 Oct 2016 09:56:49 +0200 Subject: [PATCH] make getConfigDir static --- inc/inc.ClassSettings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 00aabc562..312b6fe84 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -872,7 +872,7 @@ class Settings { /* {{{ */ function searchConfigFilePath() { /* {{{ */ $configFilePath = null; - if($configDir = $this->getConfigDir()) { + if($configDir = Settings::getConfigDir()) { if (file_exists($configDir."/settings.xml")) return $configDir."/settings.xml"; } @@ -888,7 +888,7 @@ class Settings { /* {{{ */ * 3. The directory /etc/seeddms * @return NULL|string config directory */ - function getConfigDir() { /* {{{ */ + static function getConfigDir() { /* {{{ */ $_tmp = dirname($_SERVER['SCRIPT_FILENAME']); $_arr = preg_split('/\//', rtrim(str_replace('\\', '/', $_tmp))); $configDir = null;