adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing whitespace and removig calls to Helper::output() introduced by error

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-01-14 15:38:48 -04:30
parent 0b3758dc91
commit 09b466f8aa
4 changed files with 72 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cake/libs/view/helpers/time.php
View file

@ -191,8 +191,7 @@ class TimeHelper extends AppHelper {
$date = time();
}
$format = $this->convertSpecifiers('%a, %b %eS %Y, %H:%M', $date);
$ret = strftime($format, $date);
return $this->output($ret);
return strftime($format, $date);
}
/**
@ -221,7 +220,7 @@ class TimeHelper extends AppHelper {
$ret = strftime($format, $date);
}
return $this->output($ret);
return $ret;
}
/**
@ -239,8 +238,7 @@ class TimeHelper extends AppHelper {
$begin = date('Y-m-d', $begin) . ' 00:00:00';
$end = date('Y-m-d', $end) . ' 23:59:59';
$ret ="($fieldName >= '$begin') AND ($fieldName <= '$end')";
return $this->output($ret);
return "($fieldName >= '$begin') AND ($fieldName <= '$end')";
}
/**
@ -255,7 +253,7 @@ class TimeHelper extends AppHelper {
function dayAsSql($dateString, $fieldName, $userOffset = null) {
$date = $this->fromString($dateString, $userOffset);
$ret = $this->daysAsSql($dateString, $dateString, $fieldName);
return $this->output($ret);
return $ret;
}
/**
@ -359,7 +357,7 @@ class TimeHelper extends AppHelper {
break;
}
}
return $this->output($date);
return $date;
}
/**
@ -371,7 +369,7 @@ class TimeHelper extends AppHelper {
*/
function toUnix($dateString, $userOffset = null) {
$ret = $this->fromString($dateString, $userOffset);
return $this->output($ret);
return $ret;
}
/**
@ -384,7 +382,7 @@ class TimeHelper extends AppHelper {
function toAtom($dateString, $userOffset = null) {
$date = $this->fromString($dateString, $userOffset);
$ret = date('Y-m-d\TH:i:s\Z', $date);
return $this->output($ret);
return $ret;
}
/**
@ -397,7 +395,7 @@ class TimeHelper extends AppHelper {
function toRSS($dateString, $userOffset = null) {
$date = $this->fromString($dateString, $userOffset);
$ret = date("r", $date);
return $this->output($ret);
return $ret;
}
/**
@ -577,7 +575,7 @@ class TimeHelper extends AppHelper {
$relativeDate = sprintf(__('%s ago', true), $relativeDate);
}
}
return $this->output($relativeDate);
return $relativeDate;
}
/**