diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-07-24 16:31:01 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-07-24 16:31:01 +0200 |
| commit | 9b1866f1ac8e7065ec68fcf913976a6e99cdeec0 (patch) | |
| tree | a739dc556859174db59c51e09b78ec1b2efda09c /lib/config.php | |
| parent | aae26ef5e50eb65e53517ada2209c63d991a0294 (diff) | |
| parent | 876309a2158e2948715614f226123fd416649ee7 (diff) | |
| download | nextcloud-server-9b1866f1ac8e7065ec68fcf913976a6e99cdeec0.tar.gz nextcloud-server-9b1866f1ac8e7065ec68fcf913976a6e99cdeec0.zip | |
merge master
Diffstat (limited to 'lib/config.php')
| -rw-r--r-- | lib/config.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/config.php b/lib/config.php index f7852fd68f6..e773e6e2eb0 100644 --- a/lib/config.php +++ b/lib/config.php @@ -144,11 +144,8 @@ class Config { continue; } unset($CONFIG); - if((@include $file) === false) - { - throw new HintException("Can't read from config file '" . $file . "'. ". - 'This is usually caused by the wrong file permission.'); - } + // 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); } |