diff options
| author | VicDeo <dubiniuk@owncloud.com> | 2016-07-01 12:31:02 +0300 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-07-01 11:31:02 +0200 |
| commit | 21bdd3005ba586e717b1c812ad1755eee06ff871 (patch) | |
| tree | 62060f0788643e45514b45cc85c88caa30f06da5 /lib | |
| parent | 4ac256ea6cd14f531dad0841ce7a9c5f5ffdeb51 (diff) | |
| download | nextcloud-server-21bdd3005ba586e717b1c812ad1755eee06ff871.tar.gz nextcloud-server-21bdd3005ba586e717b1c812ad1755eee06ff871.zip | |
Fix OC_Helper::rmdirr for nested symlinks (#25255)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/helper.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/helper.php b/lib/private/helper.php index 7a173520249..cabd1143f8a 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -221,7 +221,9 @@ class OC_Helper { foreach ($files as $fileInfo) { /** @var SplFileInfo $fileInfo */ - if ($fileInfo->isDir()) { + if ($fileInfo->isLink()) { + unlink($fileInfo->getPathname()); + } else if ($fileInfo->isDir()) { rmdir($fileInfo->getRealPath()); } else { unlink($fileInfo->getRealPath()); |