mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #26166 from nextcloud/backport/26131/stable21 

[stable21] Fix default missing initial state for templates
This commit is contained in:
Morris Jobke 2021-03-17 13:50:32 +01:00 committed by GitHub
parent a2d17c3c02 1be574319c
commit aa8a31b3ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/lib/Controller/ViewController.php
View File

@ -294,7 +294,7 @@ class ViewController extends Controller {
if (class_exists(LoadViewer::class)) { if (class_exists(LoadViewer::class)) {
$this->eventDispatcher->dispatchTyped(new LoadViewer()); $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()); $this->initialState->provideInitialState('templates', $this->templateManager->listCreators());
$params = []; $params = [];

2
lib/private/InitialStateService.php
View File

@ -69,7 +69,7 @@ class InitialStateService implements IInitialStateService {
return; 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 { public function provideLazyInitialState(string $appName, string $key, Closure $closure): void {