Merge remote-tracking branch 'origin/master'

2012-09-27 23:21:40 +02:00 · 2012-09-27 23:21:40 +02:00 · ba2d7081bc
parent 027037bb9f 2854df2698
commit ba2d7081bc
1 changed files with 1 additions and 2 deletions
--- a/src/Composer/Package/Loader/ArrayLoader.php
+++ b/src/Composer/Package/Loader/ArrayLoader.php
@ -136,8 +136,7 @@ class ArrayLoader implements LoaderInterface

        if (!empty($config['time'])) {
            try {
-                $date = new \DateTime($config['time']);
-                $date->setTimezone(new \DateTimeZone('UTC'));
+                $date = new \DateTime($config['time'], new \DateTimeZone('UTC'));
                $package->setReleaseDate($date);
            } catch (\Exception $e) {
            }