diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-28 10:33:55 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-28 10:33:55 +0100 |
| commit | 5fa8f7cf128d819a195c540851faf265a481df64 (patch) | |
| tree | b5eec89d7f7508025c0abbf585d1c982f1defd2d /lib/private | |
| parent | e3b951f4122f0a5d8531faaf4082bfb356366847 (diff) | |
| parent | 8b86b94d47d7fa78669bdc4f17e4b1fa39079787 (diff) | |
| download | nextcloud-server-5fa8f7cf128d819a195c540851faf265a481df64.tar.gz nextcloud-server-5fa8f7cf128d819a195c540851faf265a481df64.zip | |
Merge pull request #7107 from owncloud/load-apps-proper-master
Load apps proper master
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/user.php | 2 | ||||
| -rwxr-xr-x | lib/private/util.php | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/private/user.php b/lib/private/user.php index a89b7286c10..dc4c7ec3b61 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -321,8 +321,6 @@ class OC_User { */ public static function isLoggedIn() { if (\OC::$session->get('user_id') && self::$incognitoMode === false) { - OC_App::loadApps(array('authentication')); - self::setupBackends(); return self::userExists(\OC::$session->get('user_id')); } return false; diff --git a/lib/private/util.php b/lib/private/util.php index 87e173fa765..cd152234cc9 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -30,9 +30,7 @@ class OC_Util { } // load all filesystem apps before, so no setup-hook gets lost - if(!isset($RUNTIME_NOAPPS) || !$RUNTIME_NOAPPS) { - OC_App::loadApps(array('filesystem')); - } + OC_App::loadApps(array('filesystem')); // the filesystem will finish when $user is not empty, // mark fs setup here to avoid doing the setup from loading |