Merge branch 'master' of gitorious.org:owncloud/owncloud

1 files changed, 5 insertions, 8 deletions

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 35db244e4d6..dcb516a3afb 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -12,14 +12,10 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		}
 	}
 	public function mkdir($path){
-		if($return=mkdir($this->datadir.$path)){
-		}
-		return $return;
+		return @mkdir($this->datadir.$path);
 	}
 	public function rmdir($path){
-		if($return=rmdir($this->datadir.$path)){
-		}
-		return $return;
+		return @rmdir($this->datadir.$path);
 	}
 	public function opendir($path){
 		return opendir($this->datadir.$path);
@@ -83,8 +79,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		}
 	}
 	public function unlink($path){
-		$return=$this->delTree($path);
-		return $return;
+		return $this->delTree($path);
 	}
 	public function rename($path1,$path2){
 		if(! $this->file_exists($path1)){
@@ -171,6 +166,8 @@ class OC_Filestorage_Local extends OC_Filestorage{
 				$mimeType=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream';
 			}
 			return $mimeType;
+		}else{
+			return false;
 		}
 	}