From 8f61c666c25f2753c698f280593d060a0d371443 Mon Sep 17 00:00:00 2001
From: DarkAngelBGE <tim@debuggable.com>
Date: Thu, 23 Jul 2009 20:51:24 +0000
Subject: [PATCH] Removing usage of r() from core

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8252 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/console/libs/api.php       | 2 +-
 cake/console/libs/shell.php     | 4 ++--
 cake/libs/view/helpers/time.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cake/console/libs/api.php b/cake/console/libs/api.php
index 95897c0c206..8d6c4078df3 100644
--- a/cake/console/libs/api.php
+++ b/cake/console/libs/api.php
@@ -202,7 +202,7 @@ function __parseClass($path) {
 
 				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 bac6c347ba0..99613bf2697 100644
--- a/cake/console/libs/shell.php
+++ b/cake/console/libs/shell.php
@@ -488,8 +488,8 @@ function _checkUnitTest() {
  */
 	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 066d97906b2..e2a8c723a55 100644
--- a/cake/libs/view/helpers/time.php
+++ b/cake/libs/view/helpers/time.php
@@ -481,7 +481,7 @@ function relativeTime($dateTime, $options = array()) {
  * @return bool
  */
 	function wasWithinLast($timeInterval, $dateString, $userOffset = null) {
-		$tmp = r(' ', '', $timeInterval);
+		$tmp = str_replace(' ', '', $timeInterval);
 		if (is_numeric($tmp)) {
 			$timeInterval = $tmp . ' ' . __('days', true);
 		}