mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
Fix failing test from merge with 2.3
Fix a failed test from bad merge and remove nested conditions.
This commit is contained in:
parent
26769edd04
commit
1c1701813b
1 changed files with 3 additions and 4 deletions
|
@ -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];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue