diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-11-04 19:33:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 19:33:24 +0100 |
| commit | eb9faa7bdbb5db60a4189299196b894e12dd795d (patch) | |
| tree | 9f064a27f97708189280c1248b0a6d561299608d | |
| parent | 8f14403a9cc3fe1758bb29be2e38240bcc4ad9e4 (diff) | |
| parent | 83c60496a9925f3d672514039f0c7487ba7b913a (diff) | |
| download | nextcloud-server-eb9faa7bdbb5db60a4189299196b894e12dd795d.tar.gz nextcloud-server-eb9faa7bdbb5db60a4189299196b894e12dd795d.zip | |
Merge pull request #23888 from nextcloud/fix/noid/only-fetch-jsconfig-when-used
Only build JSConfig in TemplateLayout when it is actually used
| -rw-r--r-- | lib/private/TemplateLayout.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 81695247af0..96f8f38877c 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -194,6 +194,8 @@ class TemplateLayout extends \OC_Template { $jsFiles = self::findJavascriptFiles(\OC_Util::$scripts); $this->assign('jsfiles', []); if ($this->config->getSystemValue('installed', false) && $renderAs != TemplateResponse::RENDER_AS_ERROR) { + // this is on purpose outside of the if statement below so that the initial state is prefilled (done in the getConfig() call) + // see https://github.com/nextcloud/server/pull/22636 for details $jsConfigHelper = new JSConfigHelper( \OC::$server->getL10N('lib'), \OC::$server->query(Defaults::class), |