diff options
Diffstat (limited to 'src/SemanticScuttle/Config.php')
| -rw-r--r-- | src/SemanticScuttle/Config.php | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/SemanticScuttle/Config.php b/src/SemanticScuttle/Config.php index 756c303..28ae817 100644 --- a/src/SemanticScuttle/Config.php +++ b/src/SemanticScuttle/Config.php @@ -81,16 +81,25 @@ class SemanticScuttle_Config // then don't look in /etc for config files. // the check is not perfect, but it covers most cases $arFiles = array( - $datadir . 'config.' . $host . '.php', - $datadir . 'config.php', + "{$datadir}config.{$host}.php", + "{$datadir}config.php", + ); + $arDefaultFiles = array( + "{$datadir}config.{$host}.default.php", + "{$datadir}config.default.php", ); } else { $arFiles = array( - $datadir . 'config.' . $host . '.php', - '/etc/semanticscuttle/config.' . $host . '.php', - $datadir . 'config.php', + "{$datadir}config.{$host}.php", + "/etc/semanticscuttle/config.{$host}.php", + "{$datadir}config.php", '/etc/semanticscuttle/config.php', ); + $arDefaultFiles = array( + "{$datadir}config.{$host}.default.php", + "/etc/semanticscuttle/config.{$host}.default.php", + "{$datadir}config.default.php", + ); } $configfile = null; @@ -101,14 +110,6 @@ class SemanticScuttle_Config } } - //find default file - $arDefaultFiles = array_unique( - array( - substr($configfile, 0, -3) . 'default.php', - $datadir . 'config.default.php', - '/etc/semanticscuttle/config.default.php', - ) - ); $defaultfile = null; foreach ($arDefaultFiles as $file) { if (file_exists($this->filePrefix . $file)) { @@ -120,4 +121,4 @@ class SemanticScuttle_Config } } -?>
\ No newline at end of file +?> |