diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-04-09 18:41:18 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-04-09 18:41:18 +0200 |
| commit | de4a81f4623cf86fd77f56d8f9820742c52bd7e1 (patch) | |
| tree | 54a7e9583cdc1cbe8ad95466f4239d8e08a7e863 /lib | |
| parent | 2865f099845069bb81df78f27795bcbc102ad6ee (diff) | |
| parent | 8af52e387618afb10bb9aa77df53b55d83c7e52b (diff) | |
| download | nextcloud-server-de4a81f4623cf86fd77f56d8f9820742c52bd7e1.tar.gz nextcloud-server-de4a81f4623cf86fd77f56d8f9820742c52bd7e1.zip | |
Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource
fixes #15326
Diffstat (limited to 'lib')
| -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 0f371bbc5ea..ab7a7d3db9a 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -762,7 +762,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; + } } } } |