summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2014-06-18 07:29:04 +0200
committerLukas Reschke <lukas@statuscode.ch>2014-06-18 07:29:04 +0200
commitd4bdcb7a9b397357d623182cf85be0329a2dbf5e (patch)
treefba9eca062e4323ccc4a4164672cb5277c849e3a
parent8d1cf79152b16b11e8be3bc6cc57f5a9e72b04dd (diff)
parent7b704eeb5e2a545ff031ac33287750484769a054 (diff)
downloadnextcloud-server-d4bdcb7a9b397357d623182cf85be0329a2dbf5e.tar.gz
nextcloud-server-d4bdcb7a9b397357d623182cf85be0329a2dbf5e.zip
Merge pull request #9047 from owncloud/fix_preload_fundamental_apps
Load fundamental apps, before any possible customizing app may follow
-rw-r--r--lib/base.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php
index dcaf3725fcb..7bde1dbeb8f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -696,6 +696,8 @@ class OC {
if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) {
try {
if (!OC_Config::getValue('maintenance', false) && !self::needUpgrade()) {
+ OC_App::loadApps(array('authentication'));
+ OC_App::loadApps(array('filesystem', 'logging'));
OC_App::loadApps();
}
self::checkSingleUserMode();