mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22904 from nextcloud/backport/22636/stable19 

[stable19] Make sure that getConfig is still called for browsers that do not support CSPv3
This commit is contained in:
Roeland Jago Douma 2020-09-28 19:14:00 +02:00 committed by GitHub
parent bd037f8298 9b33e3caee
commit ed22e1bf3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/TemplateLayout.php
View File

@ -173,7 +173,6 @@ class TemplateLayout extends \OC_Template {
$jsFiles = self::findJavascriptFiles(\OC_Util::$scripts); $jsFiles = self::findJavascriptFiles(\OC_Util::$scripts);
$this->assign('jsfiles', []); $this->assign('jsfiles', []);
if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') { if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
$jsConfigHelper = new JSConfigHelper( $jsConfigHelper = new JSConfigHelper(
\OC::$server->getL10N('lib'), \OC::$server->getL10N('lib'),
\OC::$server->query(Defaults::class), \OC::$server->query(Defaults::class),
@ -187,7 +186,10 @@ class TemplateLayout extends \OC_Template {
\OC::$server->getCapabilitiesManager(), \OC::$server->getCapabilitiesManager(),
\OC::$server->query(IInitialStateService::class) \OC::$server->query(IInitialStateService::class)
); );
$config = $jsConfigHelper->getConfig();
if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
$this->assign('inline_ocjs', $jsConfigHelper->getConfig()); $this->assign('inline_ocjs', $jsConfigHelper->getConfig());
$this->assign('inline_ocjs', $config);
} else { } else {
$this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash])); $this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
} }