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

Fix code standards errors.

Browse source
This commit is contained in:
mark_story 2012-05-12 23:28:43 -04:00
parent d9244048b6
commit 64f03acd4c
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/Cake/Utility/CakeTime.php
View file

@ -376,7 +376,7 @@ class CakeTime {
$y = self::isThisYear($date) ? '' : ' %Y';
$d = self::_strftime("%w", $date);
$d = self::_strftime("%w", $date);
$day = array(
__d('cake', 'Sunday'),
__d('cake', 'Monday'),
@ -701,8 +701,6 @@ class CakeTime {
$format = $options;
}
extract($accuracy, EXTR_PREFIX_ALL, 'format');
$now = self::fromString(time(), $timezone);
$inSeconds = self::fromString($dateTime, $timezone);
$backwards = ($inSeconds > $now);
@ -785,19 +783,19 @@ class CakeTime {
$relativeDate = __d('cake', 'on %s', date($format, $inSeconds));
} else {
if ($years > 0) {
$f = $format_year;
$f = $accuracy['year'];
} elseif (abs($months) > 0) {
$f = $format_month;
$f = $accuracy['month'];
} elseif (abs($weeks) > 0) {
$f = $format_week;
$f = $accuracy['week'];
} elseif (abs($days) > 0) {
$f = $format_day;
$f = $accuracy['day'];
} elseif (abs($hours) > 0) {
$f = $format_hour;
$f = $accuracy['hour'];
} elseif (abs($minutes) > 0) {
$f = $format_minute;
$f = $accuracy['minute'];
} else {
$f = $format_second;
$f = $accuracy['second'];
}
$f = str_replace(array('year', 'month', 'week', 'day', 'hour', 'minute', 'second'), array(1, 2, 3, 4, 5, 6, 7), $f);