fix: change the place to load the maintenance theme

owncloud · Mar 11, 2024 · 67c8b89 · 67c8b89
1 parent e4506a8
commit 67c8b89
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/lib/base.php b/lib/base.php
@@ -300,6 +300,9 @@ public static function checkMaintenanceMode(IRequest $request) {
 			&& OC::$SUBURI != '/core/ajax/update.php'
 			&& !$isOccControllerRequested
 		) {
+			// load the maintenance theme if any
+			\OC_App::loadMaintenanceTheme();
+
 			// send http status 503
 			\http_response_code(503);
 			\header('Status: 503 Service Temporarily Unavailable');

diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php
@@ -273,7 +273,11 @@ public function match($url) {
 		} elseif (\substr($url, 0, 6) === '/core/' or \substr($url, 0, 10) === '/settings/') {
 			\OC::$REQUESTEDAPP = $url;
 			if (!Util::needUpgrade()) {
-				\OC_App::loadApps();
+				if (!\OC::$server->getConfig()->getSystemValue('maintenance', false)) {
+					\OC_App::loadApps();
+				} else {
+					\OC_App::loadMaintenanceTheme();
+				}
 			}
 			$this->loadRoutes('core');
 		} else {

diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
@@ -122,7 +122,6 @@ public static function loadApps($types = null) {
 		}
 
 		if (\OC::$server->getSystemConfig()->getValue('maintenance', false)) {
-			\OC_App::loadMaintenanceTheme();
 			return false;
 		}