diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-07-03 16:48:30 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-07-03 16:48:30 +0200 |
| commit | 641e77327e0ab21b2c6dbaa981c0e3d97364b358 (patch) | |
| tree | 5aa84dcf1b112e07e5e81a867a109c8a11ba359d /lib | |
| parent | b6cff93254176b9a8a88cd0e6c8a29c70d1eac20 (diff) | |
| parent | 4bc9e4e012fa0ee4300ec26d020d2b27b032ff6a (diff) | |
| download | nextcloud-server-641e77327e0ab21b2c6dbaa981c0e3d97364b358.tar.gz nextcloud-server-641e77327e0ab21b2c6dbaa981c0e3d97364b358.zip | |
Merge branch 'master' into calendar_import
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/filesystemview.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/filesystemview.php b/lib/filesystemview.php index 99e08c50e75..d474b61b98c 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -276,7 +276,7 @@ class OC_FilesystemView { }else{ $source=$this->fopen($path1,'r'); $target=$this->fopen($path2,'w'); - $count=OC_Helper::streamCopy($data,$target); + $count=OC_Helper::streamCopy($source,$target); $storage1=$this->getStorage($path1); $storage1->unlink($this->getInternalPath($path1)); $result=$count>0; @@ -314,7 +314,7 @@ class OC_FilesystemView { }else{ $source=$this->fopen($path1,'r'); $target=$this->fopen($path2,'w'); - $count=OC_Helper::streamCopy($data,$target); + $count=OC_Helper::streamCopy($source,$target); } OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_copy, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2)); if(!$exists){ |