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

fix: Avoid conflicts on notes folder creation
nextcloud · Mar 27, 2024 · 2f66178 · 2f66178
2 parents 395fb08 + a5bec1a
commit 2f66178
Showing 1 changed file with 6 additions and 0 deletions.
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');
 		}