Skip to content

Commit

Permalink
fix rebase issue
Browse files Browse the repository at this point in the history
  • Loading branch information
icewind1991 committed Apr 13, 2015
1 parent d4c91dc commit c29419e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/private/files/view.php
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,8 @@ public function rename($path1, $path2) {
}
if ($run) {
$this->verifyPath(dirname($path2), basename($path2));


$manager = Filesystem::getMountManager();
$mount1 = $this->getMount($path1);
$mount2 = $this->getMount($path2);
$storage1 = $mount1->getStorage();
Expand Down Expand Up @@ -642,7 +643,6 @@ public function rename($path1, $path2) {
} 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);
Expand Down

0 comments on commit c29419e

Please sign in to comment.