diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-06 11:34:27 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-06 11:34:27 +0100 |
| commit | 79fc4f312604feb20f96378d052703ec4768ecad (patch) | |
| tree | 437ddedcff43e5656e9899bc66aa9e6d1e49c293 /lib/base.php | |
| parent | 0db5fead8e9d4cfe410841ab4c4562987f2844a6 (diff) | |
| download | nextcloud-server-79fc4f312604feb20f96378d052703ec4768ecad.tar.gz nextcloud-server-79fc4f312604feb20f96378d052703ec4768ecad.zip | |
Within OC:init() the minimum set of apps is loaded - which is filesystem, authentication and logging
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/base.php b/lib/base.php index 18adfd31204..fb7baf86a59 100644 --- a/lib/base.php +++ b/lib/base.php @@ -567,15 +567,9 @@ class OC { OC_User::logout(); } - // Load Apps - // This includes plugins for users and filesystems as well - global $RUNTIME_APPTYPES; + // Load minimum set of apps - which is filesystem, authentication and logging if (!self::checkUpgrade(false)) { - if ($RUNTIME_APPTYPES) { - OC_App::loadApps($RUNTIME_APPTYPES); - } else { - OC_App::loadApps(); - } + OC_App::loadApps(array('filesystem', 'authentication', 'logging')); } //setup extra user backends @@ -866,7 +860,7 @@ class OC { ) { return false; } - OC_App::loadApps(array('authentication')); + if (defined("DEBUG") && DEBUG) { OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG); } @@ -938,7 +932,7 @@ class OC { ) { return false; } - OC_App::loadApps(array('authentication')); + if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG); OC_User::unsetMagicInCookie(); @@ -967,4 +961,3 @@ if (!function_exists('get_temp_dir')) { } OC::init(); - |