From 79fc4f312604feb20f96378d052703ec4768ecad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 6 Feb 2014 11:34:27 +0100
Subject: [PATCH] Within OC:init() the minimum set of apps is loaded - which is
 filesystem, authentication and logging

---
 apps/files/appinfo/remote.php |  6 ------
 core/command/user/report.php  |  3 +--
 lib/base.php                  | 15 ++++-----------
 lib/private/user.php          |  2 --
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index ef22fe9218..8d762d4e88 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -22,12 +22,6 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-// load needed apps
-$RUNTIME_APPTYPES = array('filesystem', 'authentication', 'logging');
-
-OC_App::loadApps($RUNTIME_APPTYPES);
-
-OC_Util::obEnd();
 
 // Backends
 $authBackend = new OC_Connector_Sabre_Auth();
diff --git a/core/command/user/report.php b/core/command/user/report.php
index f95ba251bc..d6b7abacab 100644
--- a/core/command/user/report.php
+++ b/core/command/user/report.php
@@ -48,7 +48,6 @@ class Report extends Command {
 	}
 
 	private function countUsers() {
-		\OC_App::loadApps(array('authentication'));
 		$userManager = \OC::$server->getUserManager();
 		return $userManager->countUsers();
 	}
@@ -58,4 +57,4 @@ class Report extends Command {
 		$userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
 		return count($userDirectories);
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/base.php b/lib/base.php
index 18adfd3120..fb7baf86a5 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();
-
diff --git a/lib/private/user.php b/lib/private/user.php
index 98ebebbe5c..11f96aabf7 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -317,8 +317,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;