diff options
| author | Robin McCorkell <rmccorkell@owncloud.com> | 2015-09-14 21:50:52 +0300 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@owncloud.com> | 2015-09-14 21:50:52 +0300 |
| commit | 35d4851af2733515a1c81d4c0b78c4c14bf570e6 (patch) | |
| tree | 7adde58609d8de5d7b64774f4339cdc4dd0c7449 /lib/private/app.php | |
| parent | 227868fe168529a638dcf2dbff4ff8f44cadc519 (diff) | |
| parent | fb9e75edb6d01729a27c84f6f11399a1b0fde9f3 (diff) | |
Merge branch 'master' into fix-app-disable-route
Diffstat (limited to 'lib/private/app.php')
| -rw-r--r-- | lib/private/app.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index d5415834fa4..6eba215ee27 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -105,7 +105,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); } } @@ -122,6 +121,8 @@ class OC_App { * @throws \OC\NeedsUpdateException */ public static function loadApp($app, $checkUpgrade = true) { + self::$loadedApps[] = $app; + \OC::$loader->addValidRoot(self::getAppPath($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)) { |