summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/private/TemplateLayout.php28
1 files changed, 15 insertions, 13 deletions
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 1fbf0acb99c..ab64c827613 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -173,21 +173,23 @@ class TemplateLayout extends \OC_Template {
$jsFiles = self::findJavascriptFiles(\OC_Util::$scripts);
$this->assign('jsfiles', []);
if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
+ $jsConfigHelper = new JSConfigHelper(
+ \OC::$server->getL10N('lib'),
+ \OC::$server->query(Defaults::class),
+ \OC::$server->getAppManager(),
+ \OC::$server->getSession(),
+ \OC::$server->getUserSession()->getUser(),
+ $this->config,
+ \OC::$server->getGroupManager(),
+ \OC::$server->getIniWrapper(),
+ \OC::$server->getURLGenerator(),
+ \OC::$server->getCapabilitiesManager(),
+ \OC::$server->query(IInitialStateService::class)
+ );
+ $config = $jsConfigHelper->getConfig();
if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
- $jsConfigHelper = new JSConfigHelper(
- \OC::$server->getL10N('lib'),
- \OC::$server->query(Defaults::class),
- \OC::$server->getAppManager(),
- \OC::$server->getSession(),
- \OC::$server->getUserSession()->getUser(),
- $this->config,
- \OC::$server->getGroupManager(),
- \OC::$server->getIniWrapper(),
- \OC::$server->getURLGenerator(),
- \OC::$server->getCapabilitiesManager(),
- \OC::$server->query(IInitialStateService::class)
- );
$this->assign('inline_ocjs', $jsConfigHelper->getConfig());
+ $this->assign('inline_ocjs', $config);
} else {
$this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
}