summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2013-07-23 17:38:37 +0200
committerBart Visscher <bartv@thisnet.nl>2013-07-23 17:38:37 +0200
commit485e8ab0a5502bacdac2a9d4e71c2b548aa8c552 (patch)
treea62373b86da457befc5ff21bfe855cfe20f84a3f /lib
parent5caa7576d493ef6b639b59718701d67bf8db90cb (diff)
downloadnextcloud-server-485e8ab0a5502bacdac2a9d4e71c2b548aa8c552.tar.gz
nextcloud-server-485e8ab0a5502bacdac2a9d4e71c2b548aa8c552.zip
ignore config read failures
Diffstat (limited to 'lib')
-rw-r--r--lib/config.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/config.php b/lib/config.php
index 00d9f5b4247..9dbe2e46bd2 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -144,7 +144,8 @@ class Config {
continue;
}
unset($CONFIG);
- include $file;
+ // ignore errors on include, this can happen when doing a fresh install
+ @include $file;
if (isset($CONFIG) && is_array($CONFIG)) {
$this->cache = array_merge($this->cache, $CONFIG);
}