summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/appinfo/remote.php6
-rw-r--r--core/command/user/report.php3
-rw-r--r--lib/base.php15
-rw-r--r--lib/private/user.php2
4 files changed, 5 insertions, 21 deletions
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index ef22fe92188..8d762d4e880 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 f95ba251bcc..d6b7abacabc 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 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();
-
diff --git a/lib/private/user.php b/lib/private/user.php
index 98ebebbe5c1..11f96aabf74 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;