adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'patch-time-gmt' of https://github.com/shama/cakephp into shama-patch-time-gmt

Browse source
This commit is contained in:
Renan Gonçalves 2011-11-07 10:42:02 +01:00
commit f09904ca91
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Cake/View/Helper/TimeHelper.php
View file

@ -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
* @param string $string UNIX timestamp or a valid strtotime() 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));