Merge pull request #9866 from owncloud/app-upgrade

Don't do app upgrades in the background

1 files changed, 12 insertions, 1 deletions

diff --git a/lib/private/util.php b/lib/private/util.php
index 1485377828d..4959cb5a786 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1465,7 +1465,18 @@ class OC_Util {
 		if (OC_Config::getValue('installed', false)) {
 			$installedVersion = OC_Config::getValue('version', '0.0.0');
 			$currentVersion = implode('.', OC_Util::getVersion());
-			return version_compare($currentVersion, $installedVersion, '>');
+			if (version_compare($currentVersion, $installedVersion, '>')) {
+				return true;
+			}
+
+			// also check for upgrades for apps
+			$apps = \OC_App::getEnabledApps();
+			foreach ($apps as $app) {
+				if (\OC_App::shouldUpgrade($app)) {
+					return true;
+				}
+			}
+			return false;
 		} else {
 			return false;
 		}