Fix failing test from merge with 2.3

Fix a failed test from bad merge and remove nested conditions.
This commit is contained in:
mark_story 2013-08-12 14:47:43 -04:00
parent 26769edd04
commit 1c1701813b

View file

@ -917,11 +917,10 @@ class CakeTime {
); );
// When time has passed // When time has passed
if (!$backwards && $relativeDate) {
return sprintf($relativeString, $relativeDate);
}
if (!$backwards) { if (!$backwards) {
if ($relativeDate) {
return __d('cake', '%s ago', $relativeDate);
}
return $aboutAgo[$fWord]; return $aboutAgo[$fWord];
} }