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

remotes/origin/stable
Thomas Tanghus 13 years ago
commit 29048bf4bd
  1. 4
      lib/filestorage/local.php
  2. 4
      lib/filesystem.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);

@ -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=='/'){

Loading…
Cancel
Save