adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix failing test from merge with 2.3

Browse source 
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
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Cake/Utility/CakeTime.php
View file

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