From 9b33e3caeef4a1da837ffaa509ac6929f5ee3135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 7 Sep 2020 09:37:49 +0200
Subject: [PATCH] Make sure that getConfig is still called for browsers that do
 not support CSPv3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/private/TemplateLayout.php | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 1fbf0acb99..ab64c82761 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]));
 			}