diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-07-01 12:08:09 +0300 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2019-07-01 12:08:09 +0300 |
| commit | 5e8f9f44a9a6a47ca7596dba0411460e2e79ce38 (patch) | |
| tree | b172ba971a390266650f1f212e102ed9bc056f91 | |
| parent | 7fbfa5cd99dca4260e7b819a2157f0421955ed10 (diff) | |
Remove some unneeded loadApp callsenh/loadApps
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | lib/base.php | 7 | ||||
| -rw-r--r-- | lib/private/legacy/app.php | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/base.php b/lib/base.php index 30d57153de9..43b0f0e5bd0 100644 --- a/lib/base.php +++ b/lib/base.php @@ -637,7 +637,7 @@ class OC { } \OC::$server->getEventLogger()->start('init_session', 'Initialize session'); - OC_App::loadApps(array('session')); + OC_App::loadApps(['session']); if (!self::$CLI) { self::initSession(); } @@ -967,10 +967,6 @@ class OC { if (!self::$CLI) { try { - if (!((bool) $systemConfig->getValue('maintenance', false)) && !\OCP\Util::needUpgrade()) { - OC_App::loadApps(array('filesystem', 'logging')); - OC_App::loadApps(); - } OC_Util::setupFS(); OC::$server->getRouter()->match(\OC::$server->getRequest()->getRawPathInfo()); return; @@ -993,7 +989,6 @@ class OC { // Someone is logged in if (\OC::$server->getUserSession()->isLoggedIn()) { - OC_App::loadApps(); OC_User::setupBackends(); OC_Util::setupFS(); // FIXME diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index d495bef2ebd..c645fe4c63f 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -140,6 +140,9 @@ class OC_App { * @throws Exception */ public static function loadApp(string $app) { + if (self::isAppLoaded($app)) { + return; + } self::$loadedApps[] = $app; $appPath = self::getAppPath($app); if($appPath === false) { |