fixup date handling in showbookmark for PHP 5.2

This commit is contained in:
Evan Prodromou 2010-12-28 23:36:25 +00:00
parent dcd0e3ec7e
commit db43195fbf

View File

@ -81,9 +81,8 @@ class ShowbookmarkAction extends ShownoticeAction
throw new ClientException(_('No such URL.'), 404); throw new ClientException(_('No such URL.'), 404);
} }
$dt = DateTime::createFromFormat('YmdHis', $dt = new DateTime($this->trimmed('created'),
$this->trimmed('created'), new DateTimeZone('UTC'));
new DateTimeZone('UTC'));
if (empty($dt)) { if (empty($dt)) {
throw new ClientException(_('No such create date.'), 404); throw new ClientException(_('No such create date.'), 404);
@ -92,9 +91,9 @@ class ShowbookmarkAction extends ShownoticeAction
$bookmarks = Bookmark::getByCRC32($this->profile, $bookmarks = Bookmark::getByCRC32($this->profile,
$crc32); $crc32);
foreach ($bookmarks as $bookmark) { foreach ($bookmarks as $bookmark) {
$bdt = new DateTime($bookmark->created, new DateTimeZone('UTC')); $bdt = new DateTime($bookmark->created, new DateTimeZone('UTC'));
if ($bdt->getTimestamp() == $dt->getTimestamp()) { if ($bdt->format('U') == $dt->format('U')) {
$this->bookmark = $bookmark; $this->bookmark = $bookmark;
break; break;
} }