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

Fixing issues with isThisWeek() when the year ends midweek.

Browse source
This commit is contained in:
mark_story 2010-12-31 16:37:16 -05:00
parent 1f6fba9d9e
commit 04c602e3d0
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cake/libs/view/helpers/time.php
View file

@ -282,7 +282,8 @@ class TimeHelper extends AppHelper {
} }
/** /**
* Returns true if given datetime string is within this week * Returns true if given datetime string is within this week.
*
* @param string $dateString * @param string $dateString
* @param int $userOffset User's offset from GMT (in hours) * @param int $userOffset User's offset from GMT (in hours)
* @return boolean True if datetime string is within current week * @return boolean True if datetime string is within current week
@ -291,7 +292,7 @@ class TimeHelper extends AppHelper {
*/ */
public function isThisWeek($dateString, $userOffset = null) { public function isThisWeek($dateString, $userOffset = null) {
$date = $this->fromString($dateString, $userOffset); $date = $this->fromString($dateString, $userOffset);
return date('W Y', $date) == date('W Y', time()); return date('W o', $date) == date('W o', time());
} }
/** /**