Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix code standards errors.

  • Loading branch information...
commit 64f03acd4c78f388222620a31bfba303d10f6947 1 parent d924404
@markstory markstory authored
Showing with 8 additions and 10 deletions.
  1. +8 −10 lib/Cake/Utility/CakeTime.php
View
18 lib/Cake/Utility/CakeTime.php
@@ -376,7 +376,7 @@ public static function niceShort($dateString = null, $timezone = null) {
$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 @@ public static function timeAgoInWords($dateTime, $options = array()) {
$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 @@ public static function timeAgoInWords($dateTime, $options = array()) {
$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);

3 comments on commit 64f03ac

@mfjohansson

That's a lot of fixes to my patch, sorry for that.

@ADmad
Collaborator

@mfjohansson You can use this in future :)

@mfjohansson

@ADmad Thanks :)

Please sign in to comment.
Something went wrong with that request. Please try again.