'token-salt-debug'

@@ -417,15 +417,12 @@ class WebAction extends Controller_Abstract
                 $cookieList[1] = intval(Encryption::decrypt($cookieList[1]));
                 if (isset($cookieList[1]) && $cookieList[1]) {
                     if ($useSession) {
-                        $token = $this->getSession('_TOKEN');
-                        if (empty($token)) {
-                            $token = $this->getCookie('_TOKEN');
-                        }
-                        if ($token === Helpers::makeToken($cookieList[1])) {
+                        $token = $this->getCookie('_TOKEN');
+                        $salt = substr($token, -8);
+                        if ($cookieList[3] === Helpers::makeToken($cookieList[1] . $salt)) {
                             $this->_uid = $cookieList[1];
                         }
-                    }
-                    else {
+                    } else {
                         $this->_uid = $cookieList[1];
                     }
                     $this->_uname = $cookieList[0];