diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-12 20:51:07 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-12 20:51:07 -0400 |
| commit | a79f2535f852c5892cf05fec66d44e22ac225c07 (patch) | |
| tree | 979e0496cfd80c091c78b957daca7e45a9551d8c /lib/filesystem.php | |
| parent | d393ccfe2c30d6ffa7de20aee6c52ae0e36efaa0 (diff) | |
| parent | a8616665002b4d49af4e65d360c0c3909f7d9a81 (diff) | |
| download | nextcloud-server-a79f2535f852c5892cf05fec66d44e22ac225c07.tar.gz nextcloud-server-a79f2535f852c5892cf05fec66d44e22ac225c07.zip | |
Merge branch 'master' into sharing
Diffstat (limited to 'lib/filesystem.php')
| -rw-r--r-- | lib/filesystem.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/filesystem.php b/lib/filesystem.php index 56007527ad3..3bb0239e9f1 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -412,7 +412,7 @@ class OC_FILESYSTEM{ } }elseif($storage1=self::getStorage($path1) and $storage2=self::getStorage($path2)){ $tmpFile=$storage1->toTmpFile(self::getInternalPath($path1)); - $result=$storage2->fromTmpFile(self::getInternalPath($path2)); + $result=$storage2->fromTmpFile($tmpFile,self::getInternalPath($path2)); } OC_HOOK::emit( 'OC_FILESYSTEM', 'post_copy', array( 'oldpath' => $path1 ,'newpath'=>$path2)); if(!$exists){ |