diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-09-07 01:26:25 +0300 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-09-07 01:26:25 +0300 |
| commit | a283bf209b8765bb0f9beb7f7d9f4112dec6e8da (patch) | |
| tree | 69b25ab4113caa5321a3565ddc04142499b7f86c | |
| parent | 019480a044d14442ee8b1c4fec43a4978ce9c7ff (diff) | |
| parent | 8d79c9576a3476122ea336c1e9d45403b1610b43 (diff) | |
Merge pull request #18843 from owncloud/app-upgrade-routenotfound-stable8
[stable8] Always add to $loadedApps
| -rw-r--r-- | lib/private/app.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index 11040840179..b942b29f71a 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -73,7 +73,6 @@ class OC_App { ob_start(); foreach ($apps as $app) { if ((is_null($types) or self::isType($app, $types)) && !in_array($app, self::$loadedApps)) { - self::$loadedApps[] = $app; self::loadApp($app); } } @@ -90,6 +89,7 @@ class OC_App { * @throws \OC\NeedsUpdateException */ public static function loadApp($app, $checkUpgrade = true) { + self::$loadedApps[] = $app; if (is_file(self::getAppPath($app) . '/appinfo/app.php')) { \OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app); if ($checkUpgrade and self::shouldUpgrade($app)) { |