rename user-id to loginname to stay consistent

diff --git a/lib/base.php b/lib/base.php
index a8e9e9018477da20e13cae61b5717c3d424963c7..f30575c7b121387657fd50b7671463fdebe83291 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -544,12 +544,12 @@ class OC {
                OC_User::useBackend(new OC_User_Database());
                OC_Group::useBackend(new OC_Group_Database());
 
-               if (isset($_SERVER['PHP_AUTH_USER']) && self::$session->exists('user_id')
+               if (isset($_SERVER['PHP_AUTH_USER']) && self::$session->exists('loginname')
                        && $_SERVER['PHP_AUTH_USER'] !== self::$session->get('loginname')) {
                        $sessionUser = self::$session->get('loginname');
                        $serverUser = $_SERVER['PHP_AUTH_USER'];
                        OC_Log::write('core',
-                               "Session user-id ($sessionUser) doesn't match SERVER[PHP_AUTH_USER] ($serverUser).",
+                               "Session loginname ($sessionUser) doesn't match SERVER[PHP_AUTH_USER] ($serverUser).",
                                OC_Log::WARN);
                        OC_User::logout();
                }