wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix rebase issue

Browse source
This commit is contained in:
Robin Appelman 2015-04-07 17:53:40 +02:00
parent d4c91dc835
commit c29419e6d7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/files/view.php
View file

@ -614,7 +614,8 @@ class View {
} }
if ($run) { if ($run) {
$this->verifyPath(dirname($path2), basename($path2)); $this->verifyPath(dirname($path2), basename($path2));
$manager = Filesystem::getMountManager();
$mount1 = $this->getMount($path1); $mount1 = $this->getMount($path1);
$mount2 = $this->getMount($path2); $mount2 = $this->getMount($path2);
$storage1 = $mount1->getStorage(); $storage1 = $mount1->getStorage();
@ -642,7 +643,6 @@ class View {
} else { } else {
$result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2); $result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2);
} }
\OC_FileProxy::runPostProxies('rename', $absolutePath1, $absolutePath2);
if ((Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) { if ((Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
// if it was a rename from a part file to a regular file it was a write and not a rename operation // if it was a rename from a part file to a regular file it was a write and not a rename operation
$this->updater->update($path2); $this->updater->update($path2);