aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2020-09-09 13:11:59 +0200
committerGitHub <noreply@github.com>2020-09-09 13:11:59 +0200
commite280c050531a87150db31adda463ff045da470fd (patch)
tree66353bfdefc03c1a134ba58024da543f5cc2ad48
parentd8dea5070b452a972f632555ddc469ebd42a4ebe (diff)
parenta9f39bf500d7fc9b3ef2d3c4ade6c46946999195 (diff)
downloadnextcloud-server-e280c050531a87150db31adda463ff045da470fd.tar.gz
nextcloud-server-e280c050531a87150db31adda463ff045da470fd.zip
Merge pull request #22636 from nextcloud/bugfix/noid/initial-stte-cspv3
Make sure that getConfig is still called for browsers that do not support CSPv3
-rw-r--r--lib/private/TemplateLayout.php29
1 files changed, 15 insertions, 14 deletions
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 4a0ec75b517..e8ebee82a5d 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -194,21 +194,22 @@ 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) {
+ $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->get(IniGetWrapper::class),
+ \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->get(IniGetWrapper::class),
- \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]));
}