Merge pull request #1936 from XWB/patch-1

Fix User serialization

Author: XWB

Model/User.php

@@ -149,7 +149,8 @@ public function addRole($role)
     /**
      * Serializes the user.
      *
-     * The serialized data have to contain the fields used by the equals method and the username.
+     * The serialized data have to contain the fields used during check for
+     * changes and the id.
      *
      * @return string
      */
@@ -165,6 +166,10 @@ public function serialize()
             $this->credentialsExpired,
             $this->enabled,
             $this->id,
+            $this->expiresAt,
+            $this->credentialsExpireAt,
+            $this->email,
+            $this->emailCanonical,
         ));
     }
 
@@ -189,7 +194,11 @@ public function unserialize($serialized)
             $this->locked,
             $this->credentialsExpired,
             $this->enabled,
-            $this->id
+            $this->id,
+            $this->expiresAt,
+            $this->credentialsExpireAt,
+            $this->email,
+            $this->emailCanonical
         ) = $data;
     }