Merge pull request schmittjoh#23 from colinmorelli/master

Fix DateTimeZone issue when using the DateTime type
royuan · Jan 20, 2013 · f319887 · f319887
2 parents a9f3100 + bd2d0ea
commit f319887
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/JMS/Serializer/Handler/DateHandler.php b/src/JMS/Serializer/Handler/DateHandler.php
@@ -98,7 +98,7 @@ public function deserializeDateTimeFromJson(JsonDeserializationVisitor $visitor,
 
     private function parseDateTime($data, array $type)
     {
-        $timezone = isset($type['params'][1]) ? $type['params'][1] : $this->defaultTimezone;
+        $timezone = isset($type['params'][1]) ? new \DateTimeZone($type['params'][1]) : $this->defaultTimezone;
         $format = $this->getFormat($type);
         $datetime = \DateTime::createFromFormat($format, (string) $data, $timezone);
         if (false === $datetime) {