summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Tom Willemse2024-06-05 15:45:15 -0700
committerGravatar Tom Willemse2024-06-05 15:45:15 -0700
commitabbaa41854ba13266aadeafda81553d11dd50947 (patch)
treeccbca2c05644a614c931a0a9409450ddcd1388f4 /src
parent2cabfe17eef1365a86e25f3b9e5bcd40ed9b84da (diff)
downloadscuttle-abbaa41854ba13266aadeafda81553d11dd50947.tar.gz
scuttle-abbaa41854ba13266aadeafda81553d11dd50947.zip
Gracefully handle being unable to find any config files
Diffstat (limited to 'src')
-rw-r--r--src/SemanticScuttle/Config.php20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/SemanticScuttle/Config.php b/src/SemanticScuttle/Config.php
index 756c303..3b0f75f 100644
--- a/src/SemanticScuttle/Config.php
+++ b/src/SemanticScuttle/Config.php
@@ -102,13 +102,17 @@ 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',
- )
- );
+ if (null === $configfile) {
+ $arDefaultFiles = array();
+ } else {
+ $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 +124,4 @@ class SemanticScuttle_Config
}
}
-?> \ No newline at end of file
+?>