Skip to content

Commit 2fae31f

Browse files
authored
Merge pull request #49876 from nextcloud/backport/49451/stable29
[stable29] fix(TemplateManager): Make sure TemplateFolder is a Folder
2 parents 0fe1a77 + c085c1b commit 2fae31f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

lib/private/Files/Template/TemplateManager.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,13 @@ public function createFromTemplate(string $filePath, string $templateId = '', st
186186
* @throws \OCP\Files\NotPermittedException
187187
* @throws \OC\User\NoUserException
188188
*/
189-
private function getTemplateFolder(): Node {
189+
private function getTemplateFolder(): Folder {
190190
if ($this->getTemplatePath() !== '') {
191-
return $this->rootFolder->getUserFolder($this->userId)->get($this->getTemplatePath());
191+
$path = $this->rootFolder->getUserFolder($this->userId)->get($this->getTemplatePath());
192+
if ($path instanceof Folder) {
193+
return $path;
194+
}
195+
$this->logger->warning('Template folder ' . $path . ' not found or invalid', ['app' => 'files_templates']);
192196
}
193197
throw new NotFoundException();
194198
}

0 commit comments

Comments
 (0)