diff options
| -rw-r--r-- | lib/config.php | 7 | ||||
| -rw-r--r-- | tests/lib/config.php | 11 |
2 files changed, 2 insertions, 16 deletions
diff --git a/lib/config.php b/lib/config.php index a38ce19c74f..9dbe2e46bd2 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); } diff --git a/tests/lib/config.php b/tests/lib/config.php index 1a1d062d688..c67a66c832e 100644 --- a/tests/lib/config.php +++ b/tests/lib/config.php @@ -80,17 +80,6 @@ class Test_Config extends PHPUnit_Framework_TestCase { */ public function testWriteData() { $config = new OC\Config('/non-writable'); - // TODO never get's called, because the previous call throws the exception - // maybe include some more logic to create a readable dir and then try to - // write to this dir - // - // console commands: - // $ sudo touch /non-writableconfig.php - // $ sudo chmod go-rwx /non-writableconfig.php - // ---- call the tests now -> above statemant throws the exception - // - // $ sudo chmod go+r /non-writableconfig.php - // ---- call the tests now -> bellow statemant throws the exception $config->setValue('foo', 'bar'); } } |