diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-14 19:26:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 19:26:01 +0100 |
| commit | 25553172f4cf37632c039904c449ee69ce43fe6a (patch) | |
| tree | 733bc15b53c60c7778b950ee96534bd5771ceddf /lib | |
| parent | 6565533d3ba7230959fd51e5355871b392eb5df2 (diff) | |
| parent | 252858ec5eee50c48d5317f4922fa85a0b789550 (diff) | |
| download | nextcloud-server-25553172f4cf37632c039904c449ee69ce43fe6a.tar.gz nextcloud-server-25553172f4cf37632c039904c449ee69ce43fe6a.zip | |
Merge pull request #3836 from nextcloud/do-not-double-check-app-update
Do not check for app update twice
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Updater.php | 2 | ||||
| -rw-r--r-- | lib/private/legacy/app.php | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 30a9a80cef4..4427e4c48dc 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -365,7 +365,7 @@ class Updater extends BasicEmitter { // load authentication, filesystem and logging apps after // upgrading them. Other apps my need to rely on modifying // user and/or filesystem aspects. - \OC_App::loadApp($appId, false); + \OC_App::loadApp($appId); } } } diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index d5af15bdc20..f89f32f069a 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -134,10 +134,8 @@ class OC_App { * load a single app * * @param string $app - * @param bool $checkUpgrade whether an upgrade check should be done - * @throws \OC\NeedsUpdateException */ - public static function loadApp($app, $checkUpgrade = true) { + public static function loadApp($app) { self::$loadedApps[] = $app; $appPath = self::getAppPath($app); if($appPath === false) { @@ -149,9 +147,6 @@ class OC_App { if (is_file($appPath . '/appinfo/app.php')) { \OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app); - if ($checkUpgrade and self::shouldUpgrade($app)) { - throw new \OC\NeedsUpdateException(); - } self::requireAppFile($app); if (self::isType($app, array('authentication'))) { // since authentication apps affect the "is app enabled for group" check, @@ -1138,7 +1133,7 @@ class OC_App { unset(self::$appVersion[$appId]); // run upgrade code if (file_exists($appPath . '/appinfo/update.php')) { - self::loadApp($appId, false); + self::loadApp($appId); include $appPath . '/appinfo/update.php'; } self::setupBackgroundJobs($appData['background-jobs']); @@ -1183,7 +1178,7 @@ class OC_App { return; } // load the app - self::loadApp($appId, false); + self::loadApp($appId); $dispatcher = OC::$server->getEventDispatcher(); |