Properly handle creating the template directory in a subfolder (fixes #…

…25787) Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Apr 1, 2021 · 6fd5714 · 6fd5714
1 parent 37591f0
commit 6fd5714
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/private/Files/Template/TemplateManager.php b/lib/private/Files/Template/TemplateManager.php
@@ -36,7 +36,6 @@
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
-use OCP\Files\NotPermittedException;
 use OCP\Files\Template\FileCreatedFromTemplateEvent;
 use OCP\Files\Template\ICustomTemplateProvider;
 use OCP\Files\Template\ITemplateManager;
@@ -300,9 +299,10 @@ public function initializeTemplateDirectory(string $path = null, string $userId
 			}
 
 			try {
-				$folder = $userFolder->newFolder($userTemplatePath);
-			} catch (NotPermittedException $e) {
 				$folder = $userFolder->get($userTemplatePath);
+			} catch (NotFoundException $e) {
+				$folder = $userFolder->get(dirname($userTemplatePath));
+				$folder = $folder->newFolder(basename($userTemplatePath));
 			}
 
 			$folderIsEmpty = count($folder->getDirectoryListing()) === 0;