diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-09-28 20:14:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-28 20:14:00 +0300 |
| commit | ed22e1bf3b7b61efc67e3b15818d26bb733164c2 (patch) | |
| tree | 259a11162f12fb157ae920aa501b086396c22080 /lib | |
| parent | bd037f8298cd36b83d672f20c3806bd3d6d1fbd0 (diff) | |
| parent | 9b33e3caeef4a1da837ffaa509ac6929f5ee3135 (diff) | |
Merge pull request #22904 from nextcloud/backport/22636/stable19
[stable19] Make sure that getConfig is still called for browsers that do not support CSPv3
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/TemplateLayout.php | 28 |
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])); } |