Fix failing test from merge with 2.3

Fix a failed test from bad merge and remove nested conditions.
cakephp · Aug 12, 2013 · 1c17018 · 1c17018
1 parent 26769ed
commit 1c17018
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/lib/Cake/Utility/CakeTime.php b/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];
 		}