Merge pull request #1260 from nextcloud/fix/notes-folder-conflict

juliusknorr · web-flow · commit 2f6617811c2d · 2024-03-27T16:22:23.000+01:00
fix: Avoid conflicts on notes folder creation
diff --git a/lib/Service/NoteUtil.php b/lib/Service/NoteUtil.php
@@ -167,6 +167,12 @@ public function getOrCreateFolder(string $path, bool $create = true) : Folder {
 		} elseif ($create) {
 			$folder = $this->root->newFolder($path);
 		}
+
+		if ($folder->isShared()) {
+			$folderName = $this->root->getNonExistingName($path);
+			$folder = $this->root->newFolder($folderName);
+		}
+
 		if (!($folder instanceof Folder)) {
 			throw new NotesFolderException($path.' is not a folder');
 		}

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,12 @@ public function getOrCreateFolder(string $path, bool $create = true) : Folder {`
`167`	`167`	`} elseif ($create) {`
`168`	`168`	`$folder = $this->root->newFolder($path);`
`169`	`169`	`}`
	`170`	`+`
	`171`	`+ if ($folder->isShared()) {`
	`172`	`+ $folderName = $this->root->getNonExistingName($path);`
	`173`	`+ $folder = $this->root->newFolder($folderName);`
	`174`	`+ }`
	`175`	`+`
`170`	`176`	`if (!($folder instanceof Folder)) {`
`171`	`177`	`throw new NotesFolderException($path.' is not a folder');`
`172`	`178`	`}`