summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2013-07-21 11:13:29 +0200
committerMorris Jobke <morris.jobke@gmail.com>2013-07-21 11:13:29 +0200
commit8f93490ac45fbd74bd0e9697a685fd43bb34239b (patch)
treee47a4124c9fe76c47f62d425dcc0fd6a4eb873e2 /lib
parent05c83a163ac55bc422a7f22184dde5da18805907 (diff)
downloadnextcloud-server-8f93490ac45fbd74bd0e9697a685fd43bb34239b.tar.gz
nextcloud-server-8f93490ac45fbd74bd0e9697a685fd43bb34239b.zip
fix failing master branch - Test_Config::testWriteData
Diffstat (limited to 'lib')
-rw-r--r--lib/config.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/config.php b/lib/config.php
index 00d9f5b4247..a38ce19c74f 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -144,7 +144,11 @@ class Config {
continue;
}
unset($CONFIG);
- include $file;
+ if((@include $file) === false)
+ {
+ throw new HintException("Can't read from config file '" . $file . "'. ".
+ 'This is usually caused by the wrong file permission.');
+ }
if (isset($CONFIG) && is_array($CONFIG)) {
$this->cache = array_merge($this->cache, $CONFIG);
}