From 64f03acd4c78f388222620a31bfba303d10f6947 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 12 May 2012 23:28:43 -0400 Subject: [PATCH] Fix code standards errors. --- lib/Cake/Utility/CakeTime.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/Cake/Utility/CakeTime.php b/lib/Cake/Utility/CakeTime.php index 5e17cd66b..e6109e602 100644 --- a/lib/Cake/Utility/CakeTime.php +++ b/lib/Cake/Utility/CakeTime.php @@ -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);