Merge remote-tracking branch 'remotes/origin/master' into feature/oneset

@@ -354,7 +354,6 @@ class AbstractAction extends Controller_Abstract
             $useSession = false;
         }
         //$useSession = false;
-
         if (!$this->_uid) {
             $cookie = $this->getCookie('_UID');
             // 兼容老的
@@ -363,11 +362,9 @@ class AbstractAction 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 {

@@ -77,6 +77,11 @@ html, body {
     line-height: 1.4;
 }
 
+body {
+    -webkit-text-size-adjust: 100% !important;
+    text-size-adjust: 100% !important;
+}
+
 button, input, select, textarea {
     font-size: 100%;
     margin: 0;