From 01113815297b6f59b7eea96dcb55db2ec374e599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 26 Jan 2021 21:32:23 +0100
Subject: [PATCH] Only create template directory if it is present in the
default skeleton
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
lib/private/Files/Template/TemplateManager.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/private/Files/Template/TemplateManager.php b/lib/private/Files/Template/TemplateManager.php
index 808c0fbb999..1942f83b86c 100644
--- a/lib/private/Files/Template/TemplateManager.php
+++ b/lib/private/Files/Template/TemplateManager.php
@@ -256,7 +256,10 @@ class TemplateManager implements ITemplateManager {
// Initial user setup without a provided path
if ($path === null) {
// All locations are default so we just need to rename the directory to the users language
- if ($isDefaultSkeleton && $isDefaultTemplates && $userFolder->nodeExists('Templates')) {
+ if ($isDefaultSkeleton && $isDefaultTemplates) {
+ if (!$userFolder->nodeExists('Templates')) {
+ return '';
+ }
$newPath = $userFolder->getPath() . '/' . $userTemplatePath;
if ($newPath !== $userFolder->get('Templates')->getPath()) {
$userFolder->get('Templates')->move($newPath);
--
GitLab