Prevent loadApps on upgrade

Moved OC::needUpgrade() to OCP\Util::needUpgrade() to make it accessible
form the router.
Moved maintenance + upgrade check to the router.

2 files changed, 19 insertions, 2 deletions

diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index e7c8ad9ebdd..f3a4bc5f3e4 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -192,7 +192,9 @@ class Router implements IRouter {
 			$this->loadRoutes($app);
 		} else if (substr($url, 0, 6) === '/core/' or substr($url, 0, 10) === '/settings/') {
 			\OC::$REQUESTEDAPP = $url;
-			\OC_App::loadApps();
+			if (!\OC_Config::getValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
+				\OC_App::loadApps();
+			}
 			$this->loadRoutes('core');
 		} else {
 			$this->loadRoutes();
diff --git a/lib/private/util.php b/lib/private/util.php
index dfdddd0e3ab..94005daef61 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -329,7 +329,7 @@ class OC_Util {
 		$errors = array();
 		$CONFIG_DATADIRECTORY = OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data');
 
-		if (!\OC::needUpgrade() && OC_Config::getValue('installed', false)) {
+		if (!self::needUpgrade() && OC_Config::getValue('installed', false)) {
 			// this check needs to be done every time
 			$errors = self::checkDataDirectoryValidity($CONFIG_DATADIRECTORY);
 		}
@@ -1356,4 +1356,19 @@ class OC_Util {
 		}
 		return true;
 	}
+
+	/**
+	 * Check whether the instance needs to preform an upgrade
+	 *
+	 * @return bool
+	 */
+	public static function needUpgrade() {
+		if (OC_Config::getValue('installed', false)) {
+			$installedVersion = OC_Config::getValue('version', '0.0.0');
+			$currentVersion = implode('.', OC_Util::getVersion());
+			return version_compare($currentVersion, $installedVersion, '>');
+		} else {
+			return false;
+		}
+	}
 }