diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-04-10 23:39:46 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-04-10 23:39:46 +0200 |
| commit | 06ab387509e81fb33a5cef30ee038a9019c4b128 (patch) | |
| tree | efdacd9a4d969bb04723381fd527a710859dbb5c | |
| parent | 3f6db4c1ab1dfff61f27101219baf5f88a114409 (diff) | |
| parent | 7a3b4b464e2b2c95445fcef7563a4086ebcbc707 (diff) | |
| download | nextcloud-server-06ab387509e81fb33a5cef30ee038a9019c4b128.tar.gz nextcloud-server-06ab387509e81fb33a5cef30ee038a9019c4b128.zip | |
Merge pull request #15539 from owncloud/stable8-fixRenameFailDeleteTargetKeepSource
[stable8] Fix renameFailDeleteTargetKeepSource
| -rw-r--r-- | lib/private/files/view.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/files/view.php b/lib/private/files/view.php index b5ad425a0fa..b58a8c2d639 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -639,7 +639,9 @@ class View { if (is_resource($dh)) { while (($file = readdir($dh)) !== false) { if (!Filesystem::isIgnoredDir($file)) { - $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file, $preserveMtime); + if (!$this->copy($path1 . '/' . $file, $path2 . '/' . $file, $preserveMtime)) { + $result = false; + } } } } |