mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14471 from owncloud/always-load-authentication-apps 

Always load authentication apps
This commit is contained in:
Thomas Müller 2015-02-24 23:31:40 -08:00
parent 31f881415b c1d7b22d08
commit 7e7e0c51fb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/base.php
View File

@ -797,6 +797,9 @@ class OC {
self::checkUpgrade(); self::checkUpgrade();
} }
// Always load authentication apps
OC_App::loadApps(['authentication']);
// Load minimum set of apps // Load minimum set of apps
if (!self::checkUpgrade(false) if (!self::checkUpgrade(false)
&& !$systemConfig->getValue('maintenance', false) && !$systemConfig->getValue('maintenance', false)
@ -805,8 +808,7 @@ class OC {
if(OC_User::isLoggedIn()) { if(OC_User::isLoggedIn()) {
OC_App::loadApps(); OC_App::loadApps();
} else { } else {
// For guests: Load only authentication, filesystem and logging // For guests: Load only filesystem and logging
OC_App::loadApps(array('authentication'));
OC_App::loadApps(array('filesystem', 'logging')); OC_App::loadApps(array('filesystem', 'logging'));
\OC_User::tryBasicAuthLogin(); \OC_User::tryBasicAuthLogin();
} }
@ -815,7 +817,6 @@ class OC {
if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) { if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) {
try { try {
if (!$systemConfig->getValue('maintenance', false) && !\OCP\Util::needUpgrade()) { if (!$systemConfig->getValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
OC_App::loadApps(array('authentication'));
OC_App::loadApps(array('filesystem', 'logging')); OC_App::loadApps(array('filesystem', 'logging'));
OC_App::loadApps(); OC_App::loadApps();
} }