Permalink
Browse files

Fix failing test from merge with 2.3

Fix a failed test from bad merge and remove nested conditions.
  • Loading branch information...
1 parent 26769ed commit 1c1701813bfc965f3d61bef4886a04fa2dcf0c94 @markstory markstory committed Aug 12, 2013
Showing with 3 additions and 4 deletions.
  1. +3 −4 lib/Cake/Utility/CakeTime.php
@@ -917,11 +917,10 @@ public static function timeAgoInWords($dateTime, $options = array()) {
);
// When time has passed
+ if (!$backwards && $relativeDate) {
+ return sprintf($relativeString, $relativeDate);
+ }
if (!$backwards) {
- if ($relativeDate) {
- return __d('cake', '%s ago', $relativeDate);
- }
-
return $aboutAgo[$fWord];
}

0 comments on commit 1c17018

Please sign in to comment.