Merge pull request #45590 from nextcloud/backport/45413/stable29

skjnldsv · web-flow · commit 620669d57123 · 2024-06-07T11:59:55.000+02:00
diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php
@@ -158,7 +158,7 @@ public function newFolder($path) {
 			$fullPath = $this->getFullPath($path);
 			$nonExisting = new NonExistingFolder($this->root, $this->view, $fullPath);
 			$this->sendHooks(['preWrite', 'preCreate'], [$nonExisting]);
-			if (!$this->view->mkdir($fullPath)) {
+			if (!$this->view->mkdir($fullPath) && !$this->view->is_dir($fullPath)) {
 				throw new NotPermittedException('Could not create folder "' . $fullPath . '"');
 			}
 			$parent = dirname($fullPath) === $this->getPath() ? $this : null;

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public function newFolder($path) {`
`158`	`158`	`$fullPath = $this->getFullPath($path);`
`159`	`159`	`$nonExisting = new NonExistingFolder($this->root, $this->view, $fullPath);`
`160`	`160`	`$this->sendHooks(['preWrite', 'preCreate'], [$nonExisting]);`
`161`		`- if (!$this->view->mkdir($fullPath)) {`
	`161`	`+ if (!$this->view->mkdir($fullPath) && !$this->view->is_dir($fullPath)) {`
`162`	`162`	`throw new NotPermittedException('Could not create folder "' . $fullPath . '"');`
`163`	`163`	`}`
`164`	`164`	`$parent = dirname($fullPath) === $this->getPath() ? $this : null;`