Permalink
Browse files

Merge branch 'master' into 2.3

  • Loading branch information...
2 parents c24bec6 + 667dfd3 commit c794e295a08c2fea20287f8f1b5e5f46dfff5422 @markstory markstory committed Oct 28, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/Cake/Test/Case/Utility/CakeTimeTest.php
@@ -518,7 +518,7 @@ public function testToRss() {
$yourTimezone = new DateTimeZone($timezone);
$yourTime = new DateTime($date, $yourTimezone);
$userOffset = $yourTimezone->getOffset($yourTime) / HOUR;
- $time = $yourTime->getTimestamp();
+ $time = $yourTime->format('U');
$this->assertEquals($yourTime->format('r'), $this->Time->toRss($time, $userOffset), "Failed on $timezone");
$this->assertEquals($yourTime->format('r'), $this->Time->toRss($time, $timezone), "Failed on $timezone");
}

0 comments on commit c794e29

Please sign in to comment.