From: Julius Härtl <jus@bitgrid.net>
Date: Tue, 15 Dec 2020 20:14:07 +0000 (+0100)
Subject: Do not include non-required scripts on the upgrade page
X-Git-Tag: v20.0.5RC1~46^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=55d7848384c7d0c41507c21714429010454deff9;p=nextcloud-server.git

Do not include non-required scripts on the upgrade page

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---

diff --git a/lib/private/legacy/OC_Template.php b/lib/private/legacy/OC_Template.php
index 54c203a3ab6..b752e057869 100644
--- a/lib/private/legacy/OC_Template.php
+++ b/lib/private/legacy/OC_Template.php
@@ -114,7 +114,7 @@ class OC_Template extends \OC\Template\Base {
 			OC_Util::addStyle('server', null, true);
 			OC_Util::addTranslations('core', null, true);
 
-			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
+			if (\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade()) {
 				OC_Util::addScript('merged-template-prepend', null, true);
 				OC_Util::addScript('dist/files_client', null, true);
 				OC_Util::addScript('dist/files_fileinfo', null, true);