Resolving 9969 resubmitting to fix rebase issue.

lib/private/files/storage/local.php

@@ -208,22 +208,7 @@ if (\OC_Util::runningOnWindows()) {
 		}
 
 		public function fopen($path, $mode) {
-			if ($return = fopen($this->datadir . $path, $mode)) {
+			return fopen($this->datadir . $path, $mode);
-				switch ($mode) {
-					case 'r':
-						break;
-					case 'r+':
-					case 'w+':
-					case 'x+':
-					case 'a+':
-						break;
-					case 'w':
-					case 'x':
-					case 'a':
-						break;
-				}
-			}
-			return $return;
 		}
 
 		public function hash($type, $path, $raw = false) {

lib/private/files/storage/mappedlocal.php

@@ -245,26 +245,13 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	}
 
 	public function fopen($path, $mode) {
-		if ($return = fopen($this->buildPath($path), $mode)) {
+		return fopen($this->buildPath($path), $mode);
-			switch ($mode) {
-				case 'r':
-					break;
-				case 'r+':
-				case 'w+':
-				case 'x+':
-				case 'a+':
-					break;
-				case 'w':
-				case 'x':
-				case 'a':
-					break;
-			}
-		}
-		return $return;
 	}
 
 	/**
 	 * @param string $dir
+	 * @param bool $isLogicPath
+	 * @return bool
 	 */
 	private function delTree($dir, $isLogicPath = true) {
 		$dirRelative = $dir;