X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Flogin.php;h=b049791fb1858dac3d79625317efa0ae77bb5bd9;hb=f9babf6a7d4215e763a8c1766a2e6592fe274953;hp=98cc8a855fbd65102f6cce5416b7a3a07acc1709;hpb=a97f8f6a43b27b3392ef9b03be58e37d743f394d;p=quix0rs-gnu-social.git

diff --git a/actions/login.php b/actions/login.php
index 98cc8a855f..b049791fb1 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -78,6 +78,7 @@ class LoginAction extends Action
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->checkLogin();
         } else {
+            common_ensure_session();
             $this->showForm();
         }
     }
@@ -107,13 +108,15 @@ class LoginAction extends Action
         $nickname = common_canonical_nickname($this->trimmed('nickname'));
         $password = $this->arg('password');
 
-        if (!common_check_user($nickname, $password)) {
+        $user = common_check_user($nickname, $password);
+
+        if (!$user) {
             $this->showForm(_('Incorrect username or password.'));
             return;
         }
 
         // success!
-        if (!common_set_user($nickname)) {
+        if (!common_set_user($user)) {
             $this->serverError(_('Error setting user.'));
             return;
         }