From 1c1701813bfc965f3d61bef4886a04fa2dcf0c94 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 12 Aug 2013 14:47:43 -0400
Subject: [PATCH] Fix failing test from merge with 2.3

Fix a failed test from bad merge and remove nested conditions.
---
 lib/Cake/Utility/CakeTime.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/Cake/Utility/CakeTime.php b/lib/Cake/Utility/CakeTime.php
index ab004617674..cc2db956873 100644
--- 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];
 		}