Merge git://gitorious.org/owncloud/owncloud into oc_image

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 02746fa6c6f..cfc27159786 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -50,10 +50,10 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		}
 	}
 	public function is_readable($path){
-		return true;
+		return is_readable($this->datadir.$path);
 	}
 	public function is_writeable($path){
-		return true;
+		return is_writable($this->datadir.$path);
 	}
 	public function file_exists($path){
 		return file_exists($this->datadir.$path);
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 9b3dde1ae07..1205a6aa51b 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -245,7 +245,7 @@ class OC_Filesystem{
 			return false;
 		}
 		$storage=self::getStorage($path);
-		return $storage->is_readable($path);
+		return $storage->is_readable(self::getInternalPath($path));
 	}
 	static public function is_writeable($path){
 		if(substr($path,0,1)!=='/'){
@@ -255,7 +255,7 @@ class OC_Filesystem{
 			return false;
 		}
 		$storage=self::getStorage($path);
-		return $storage->is_writeable($path);
+		return $storage->is_writeable(self::getInternalPath($path));
 	}
 	static public function file_exists($path){
 		if($path=='/'){