diff --git a/cake/console/libs/api.php b/cake/console/libs/api.php index 95897c0c2..8d6c4078d 100644 --- a/cake/console/libs/api.php +++ b/cake/console/libs/api.php @@ -202,7 +202,7 @@ class ApiShell extends Shell { if (strpos($method, '__') === false && $method[0] != '_') { $parsed[$method] = array( - 'comment' => r(array('/*', '*/', '*'), '', trim($result[1][$key])), + 'comment' => str_replace(array('/*', '*/', '*'), '', trim($result[1][$key])), 'method' => $method, 'parameters' => trim($result[3][$key]) ); diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php index bac6c347b..99613bf26 100644 --- a/cake/console/libs/shell.php +++ b/cake/console/libs/shell.php @@ -488,8 +488,8 @@ class Shell extends Object { */ function shortPath($file) { $shortPath = str_replace(ROOT, null, $file); - $shortPath = str_replace('..'.DS, '', $shortPath); - return r(DS.DS, DS, $shortPath); + $shortPath = str_replace('..' . DS, '', $shortPath); + return str_replace(DS . DS, DS, $shortPath); } /** * Checks for Configure::read('Routing.admin') and forces user to input it if not enabled diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php index 066d97906..e2a8c723a 100644 --- a/cake/libs/view/helpers/time.php +++ b/cake/libs/view/helpers/time.php @@ -481,7 +481,7 @@ class TimeHelper extends AppHelper { * @return bool */ function wasWithinLast($timeInterval, $dateString, $userOffset = null) { - $tmp = r(' ', '', $timeInterval); + $tmp = str_replace(' ', '', $timeInterval); if (is_numeric($tmp)) { $timeInterval = $tmp . ' ' . __('days', true); }