Merge pull request #38429 from tanganellilore/fix_delete_user_syslink

Fix deletion of User when system link are used in him user folder
nextcloud · May 25, 2023 · f29aa29 · f29aa29
2 parents 477d644 + 6b55e92
commit f29aa29
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
@@ -136,10 +136,10 @@ public function rmdir($path) {
 				if (in_array($file->getBasename(), ['.', '..'])) {
 					$it->next();
 					continue;
-				} elseif ($file->isDir()) {
-					rmdir($file->getPathname());
 				} elseif ($file->isFile() || $file->isLink()) {
 					unlink($file->getPathname());
+				} elseif ($file->isDir()) {
+					rmdir($file->getPathname());
 				}
 				$it->next();
 			}