From: Robin Appelman Date: Tue, 7 Apr 2015 15:53:40 +0000 (+0200) Subject: fix rebase issue X-Git-Tag: v8.1.0alpha1~15^2~1 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c29419e6d7e5a47a063a598dc2300275e344f893;p=nextcloud-server.git fix rebase issue --- diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 84164e2a249..313237c5f59 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -614,7 +614,8 @@ class View { } if ($run) { $this->verifyPath(dirname($path2), basename($path2)); - + + $manager = Filesystem::getMountManager(); $mount1 = $this->getMount($path1); $mount2 = $this->getMount($path2); $storage1 = $mount1->getStorage(); @@ -642,7 +643,6 @@ class View { } else { $result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2); } - \OC_FileProxy::runPostProxies('rename', $absolutePath1, $absolutePath2); 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 $this->updater->update($path2);