Move writable check into local filestorage so shared files can be renamed
This commit is contained in:
parent
cce59df2ae
commit
ff4b0c4d7f
|
@ -86,6 +86,10 @@ class OC_Filestorage_Local extends OC_Filestorage{
|
||||||
return $this->delTree($path);
|
return $this->delTree($path);
|
||||||
}
|
}
|
||||||
public function rename($path1,$path2){
|
public function rename($path1,$path2){
|
||||||
|
if (!$this->is_writable($path1)) {
|
||||||
|
OC_Log::write('core','unable to rename, file is not writable : '.$path1,OC_Log::ERROR);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if(! $this->file_exists($path1)){
|
if(! $this->file_exists($path1)){
|
||||||
OC_Log::write('core','unable to rename, file does not exists : '.$path1,OC_Log::ERROR);
|
OC_Log::write('core','unable to rename, file does not exists : '.$path1,OC_Log::ERROR);
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -192,7 +192,7 @@ class OC_FilesystemView {
|
||||||
return $this->basicOperation('unlink',$path,array('delete'));
|
return $this->basicOperation('unlink',$path,array('delete'));
|
||||||
}
|
}
|
||||||
public function rename($path1,$path2){
|
public function rename($path1,$path2){
|
||||||
if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and $this->is_writable($path1) and OC_Filesystem::isValidPath($path2)){
|
if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and OC_Filesystem::isValidPath($path2)){
|
||||||
$run=true;
|
$run=true;
|
||||||
OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2, OC_Filesystem::signal_param_run => &$run));
|
OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2, OC_Filesystem::signal_param_run => &$run));
|
||||||
if($run){
|
if($run){
|
||||||
|
|
Loading…
Reference in New Issue