Merge pull request #4171 from owncloud/fix-config

Fix config

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);
 			}

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');
 	}
 }