Added the id in the serialized user

Maxwell2022 · Jul 10, 2012 · e1f5b11 · e1f5b11
1 parent c3ffc16
commit e1f5b11
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+### 1.2.3 (2012-07-10)
+
+* Fixed the serialization of users to include the id
+
 ### 1.2.2 (2012-07-10)
 
 * Fixed a bug in the previous fix

diff --git a/Model/User.php b/Model/User.php
@@ -210,6 +210,7 @@ public function serialize()
             $this->locked,
             $this->credentialsExpired,
             $this->enabled,
+            $this->id,
         ));
     }
 
@@ -220,6 +221,11 @@ public function serialize()
      */
     public function unserialize($serialized)
     {
+        $data = unserialize($serialized);
+        // add a few extra elements in the array to ensure that we have enough keys when unserializing
+        // older data which does not include all properties.
+        $data = array_merge($data, array_fill(0, 2, null));
+
         list(
             $this->password,
             $this->salt,
@@ -228,8 +234,9 @@ public function unserialize($serialized)
             $this->expired,
             $this->locked,
             $this->credentialsExpired,
-            $this->enabled
-        ) = unserialize($serialized);
+            $this->enabled,
+            $this->id
+        ) = $data;
     }
 
     /**