diff options
| author | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-01-13 13:35:54 +0100 |
|---|---|---|
| committer | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-01-13 13:35:54 +0100 |
| commit | ba8c050d2b827804d0c860be19591c9d35fd0adf (patch) | |
| tree | 0a1df4e6aaac4dd4c6ee4312d03ed9463f77ae78 | |
| parent | 543fa0d45b23173ed94f4c865fe38855b1602ee4 (diff) | |
| parent | 5f31207e841e567d25fc99f7c34274ca5dd9e630 (diff) | |
| download | nextcloud-server-ba8c050d2b827804d0c860be19591c9d35fd0adf.tar.gz nextcloud-server-ba8c050d2b827804d0c860be19591c9d35fd0adf.zip | |
Merge pull request #13217 from owncloud/make-basic-auth-work-again
Fix Basic Auth in master for applications
| -rw-r--r-- | lib/base.php | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/lib/base.php b/lib/base.php index 34fa178ebf7..dbfe0eb2f27 100644 --- a/lib/base.php +++ b/lib/base.php @@ -736,6 +736,21 @@ class OC { self::checkUpgrade(); } + // Load minimum set of apps + if (!self::checkUpgrade(false) + && !$systemConfig->getValue('maintenance', false) + && !\OCP\Util::needUpgrade()) { + // For logged-in users: Load everything + if(OC_User::isLoggedIn()) { + OC_App::loadApps(); + } else { + // For guests: Load only authentication, filesystem and logging + OC_App::loadApps(array('authentication')); + OC_App::loadApps(array('filesystem', 'logging')); + \OC_User::tryBasicAuthLogin(); + } + } + if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) { try { if (!$systemConfig->getValue('maintenance', false) && !\OCP\Util::needUpgrade()) { @@ -755,19 +770,6 @@ class OC { } } - // Load minimum set of apps - if (!self::checkUpgrade(false)) { - // For logged-in users: Load everything - if(OC_User::isLoggedIn()) { - OC_App::loadApps(); - } else { - // For guests: Load only authentication, filesystem and logging - OC_App::loadApps(array('authentication')); - OC_App::loadApps(array('filesystem', 'logging')); - \OC_User::tryBasicAuthLogin(); - } - } - // Handle redirect URL for logged in users if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) { $location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url'])); |