From 72502e8fec86ad5bb2894e687e44115cbb4de3bc Mon Sep 17 00:00:00 2001 From: Kyle Robinson Young Date: Sun, 6 Nov 2011 22:54:52 -0800 Subject: [PATCH] Remove extra fromString in TimeHelper::gmt and update docblock --- lib/Cake/View/Helper/TimeHelper.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/Cake/View/Helper/TimeHelper.php b/lib/Cake/View/Helper/TimeHelper.php index 7bd5b5e6f..fe574207b 100644 --- a/lib/Cake/View/Helper/TimeHelper.php +++ b/lib/Cake/View/Helper/TimeHelper.php @@ -676,10 +676,10 @@ class TimeHelper extends AppHelper { } /** - * Returns gmt, given either a UNIX timestamp or a valid strtotime() date string. + * Returns gmt as a UNIX timestamp. * * @param string $string Datetime string - * @return string Formatted date string + * @return integer UNIX timestamp * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting */ public function gmt($string = null) { @@ -688,7 +688,6 @@ class TimeHelper extends AppHelper { } else { $string = time(); } - $string = $this->fromString($string); $hour = intval(date("G", $string)); $minute = intval(date("i", $string)); $second = intval(date("s", $string));