diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-07-23 17:36:08 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-07-23 17:36:08 +0200 |
| commit | 5caa7576d493ef6b639b59718701d67bf8db90cb (patch) | |
| tree | 795db285e12f66e5837497ad9b60cb6e9cc5ec84 | |
| parent | 6ddad8dc4990e522630b020a8d06fdf939776f05 (diff) | |
| download | nextcloud-server-5caa7576d493ef6b639b59718701d67bf8db90cb.tar.gz nextcloud-server-5caa7576d493ef6b639b59718701d67bf8db90cb.zip | |
Revert "fix failing master branch - Test_Config::testWriteData"
This reverts commit 8f93490ac45fbd74bd0e9697a685fd43bb34239b.
| -rw-r--r-- | lib/config.php | 6 | ||||
| -rw-r--r-- | tests/lib/config.php | 11 |
2 files changed, 1 insertions, 16 deletions
diff --git a/lib/config.php b/lib/config.php index a38ce19c74f..00d9f5b4247 100644 --- a/lib/config.php +++ b/lib/config.php @@ -144,11 +144,7 @@ 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.'); - } + 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'); } } |