issue 476 on upstream

jpfuentes2 · Dec 18, 2014 · de77baa · de77baa
1 parent 083c446
commit de77baa
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/Serialization.php b/lib/Serialization.php
@@ -173,7 +173,11 @@ private function check_include()
 				try {
 					$assoc = $this->model->$association;
 
-					if (!is_array($assoc))
+					if (is_null($assoc))
+					{
+						$this->attributes[$association] = null;
+					}
+					elseif (!is_array($assoc))
 					{
 						$serialized = new $serializer_class($assoc, $options);
 						$this->attributes[$association] = $serialized->to_a();;