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

Removing usage of r() from core

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8252 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
DarkAngelBGE 2009-07-23 20:51:24 +00:00
parent 30281d6c59
commit 8f61c666c2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/console/libs/api.php
View file

@ -202,7 +202,7 @@ class ApiShell extends Shell {
if (strpos($method, '__') === false && $method[0] != '_') { if (strpos($method, '__') === false && $method[0] != '_') {
$parsed[$method] = array( $parsed[$method] = array(
'comment' => r(array('/*', '*/', '*'), '', trim($result[1][$key])), 'comment' => str_replace(array('/*', '*/', '*'), '', trim($result[1][$key])),
'method' => $method, 'method' => $method,
'parameters' => trim($result[3][$key]) 'parameters' => trim($result[3][$key])
); );

4
cake/console/libs/shell.php
View file

@ -488,8 +488,8 @@ class Shell extends Object {
*/ */
function shortPath($file) { function shortPath($file) {
$shortPath = str_replace(ROOT, null, $file); $shortPath = str_replace(ROOT, null, $file);
$shortPath = str_replace('..'.DS, '', $shortPath); $shortPath = str_replace('..' . DS, '', $shortPath);
return r(DS.DS, DS, $shortPath); return str_replace(DS . DS, DS, $shortPath);
} }
/** /**
* Checks for Configure::read('Routing.admin') and forces user to input it if not enabled * Checks for Configure::read('Routing.admin') and forces user to input it if not enabled

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

@ -481,7 +481,7 @@ class TimeHelper extends AppHelper {
* @return bool * @return bool
*/ */
function wasWithinLast($timeInterval, $dateString, $userOffset = null) { function wasWithinLast($timeInterval, $dateString, $userOffset = null) {
$tmp = r(' ', '', $timeInterval); $tmp = str_replace(' ', '', $timeInterval);
if (is_numeric($tmp)) { if (is_numeric($tmp)) {
$timeInterval = $tmp . ' ' . __('days', true); $timeInterval = $tmp . ' ' . __('days', true);
} }