[Pkg-owncloud-commits] [owncloud] 03/67: Prevent loadApps on upgrade

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 799205488cf82312586f99185e13df6015caa2ff
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Tue Jun 10 18:01:07 2014 +0200

    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.
---
 lib/base.php                 | 18 ++++++------------
 lib/private/route/router.php |  4 +++-
 lib/private/util.php         | 17 ++++++++++++++++-
 lib/public/util.php          |  9 +++++++++
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 7bde1db..ca2e49b 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -262,15 +262,10 @@ class OC {
 	 * check if the instance needs to preform an upgrade
 	 *
 	 * @return bool
+	 * @deprecated use \OCP\Util::needUpgrade instead
 	 */
 	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;
-		}
+		return \OCP\Util::needUpgrade();
 	}
 
 	/**
@@ -279,7 +274,7 @@ class OC {
 	 * @return bool|void
 	 */
 	public static function checkUpgrade($showTemplate = true) {
-		if (self::needUpgrade()) {
+		if (\OCP\Util::needUpgrade()) {
 			if ($showTemplate && !OC_Config::getValue('maintenance', false)) {
 				$version = OC_Util::getVersion();
 				$oldTheme = OC_Config::getValue('theme');
@@ -595,7 +590,7 @@ class OC {
 	 * register hooks for the cache
 	 */
 	public static function registerCacheHooks() {
-		if (OC_Config::getValue('installed', false) && !self::needUpgrade()) { //don't try to do this before we are properly setup
+		if (OC_Config::getValue('installed', false) && !\OCP\Util::needUpgrade()) { //don't try to do this before we are properly setup
 			\OCP\BackgroundJob::registerJob('OC\Cache\FileGlobalGC');
 
 			// NOTE: This will be replaced to use OCP
@@ -608,7 +603,7 @@ class OC {
 	 * register hooks for the cache
 	 */
 	public static function registerLogRotate() {
-		if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false) && !self::needUpgrade()) {
+		if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
 			//don't try to do this before we are properly setup
 			//use custom logfile path if defined, otherwise use default of owncloud.log in data directory
 			\OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue('logfile', OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/owncloud.log'));
@@ -695,10 +690,9 @@ class OC {
 
 		if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) {
 			try {
-				if (!OC_Config::getValue('maintenance', false) && !self::needUpgrade()) {
+				if (!OC_Config::getValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
 					OC_App::loadApps(array('authentication'));
 					OC_App::loadApps(array('filesystem', 'logging'));
-					OC_App::loadApps();
 				}
 				self::checkSingleUserMode();
 				OC::$server->getRouter()->match(OC_Request::getRawPathInfo());
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index e7c8ad9..f3a4bc5 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 dfdddd0..94005da 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;
+		}
+	}
 }
diff --git a/lib/public/util.php b/lib/public/util.php
index d1faec3..8f4691e 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -516,4 +516,13 @@ class Util {
 	public static function isPublicLinkPasswordRequired() {
 		return \OC_Util::isPublicLinkPasswordRequired();
 	}
+
+	/**
+	 * Checks whether the current version needs upgrade.
+	 *
+	 * @return bool true if upgrade is needed, false otherwise
+	 */
+	public static function needUpgrade() {
+		return \OC_Util::needUpgrade();
+	}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git