aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <vincent@nextcloud.com>2021-03-17 10:18:03 +0100
committerGitHub <noreply@github.com>2021-03-17 10:18:03 +0100
commitab5c19bb081ca073f3b9a2441a74cb83c807d797 (patch)
treea210d0e9248b4aa2762d6003700939adff017c40
parent98fb265e9f889f4a6fb5473879cfb54cba777c5b (diff)
parent223fe2aae6703eb768a8d18ee240e46d67e47b1f (diff)
downloadnextcloud-server-ab5c19bb081ca073f3b9a2441a74cb83c807d797.tar.gz
nextcloud-server-ab5c19bb081ca073f3b9a2441a74cb83c807d797.zip
Merge pull request #26131 from nextcloud/fix/initialstate-templates
Fix default missing initial state for templates
-rw-r--r--apps/files/lib/Controller/ViewController.php2
-rw-r--r--lib/private/InitialStateService.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index aade5a5b44a..da828cc6074 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -294,7 +294,7 @@ class ViewController extends Controller {
if (class_exists(LoadViewer::class)) {
$this->eventDispatcher->dispatchTyped(new LoadViewer());
}
- $this->initialState->provideInitialState('templates_path', $this->templateManager->hasTemplateDirectory() ? $this->templateManager->getTemplatePath() : null);
+ $this->initialState->provideInitialState('templates_path', $this->templateManager->hasTemplateDirectory() ? $this->templateManager->getTemplatePath() : false);
$this->initialState->provideInitialState('templates', $this->templateManager->listCreators());
$params = [];
diff --git a/lib/private/InitialStateService.php b/lib/private/InitialStateService.php
index bbab831b915..bbc893269f7 100644
--- a/lib/private/InitialStateService.php
+++ b/lib/private/InitialStateService.php
@@ -69,7 +69,7 @@ class InitialStateService implements IInitialStateService {
return;
}
- $this->logger->warning('Invalid data provided to provideInitialState by ' . $appName);
+ $this->logger->warning('Invalid '. $key . ' data provided to provideInitialState by ' . $appName);
}
public function provideLazyInitialState(string $appName, string $key, Closure $closure): void {