aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2015-04-07 17:53:40 +0200
committerRobin Appelman <icewind@owncloud.com>2015-04-13 15:13:03 +0200
commitc29419e6d7e5a47a063a598dc2300275e344f893 (patch)
treeb994420b5c1af3cf7e777d47300e62623dd8887c /lib
parentd4c91dc8356a3514487e2357c1882cdf9eaa2090 (diff)
downloadnextcloud-server-c29419e6d7e5a47a063a598dc2300275e344f893.tar.gz
nextcloud-server-c29419e6d7e5a47a063a598dc2300275e344f893.zip
fix rebase issue
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/view.php4
1 files changed, 2 insertions, 2 deletions
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);