Skip to content
This repository
Browse code

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
  • Loading branch information...
commit 8f61c666c25f2753c698f280593d060a0d371443 1 parent 30281d6
Tim Koschuetzki authored July 23, 2009
2  cake/console/libs/api.php
@@ -202,7 +202,7 @@ function __parseClass($path) {
202 202
 
203 203
 				if (strpos($method, '__') === false && $method[0] != '_') {
204 204
 					$parsed[$method] = array(
205  
-						'comment' => r(array('/*', '*/', '*'), '', trim($result[1][$key])),
  205
+						'comment' => str_replace(array('/*', '*/', '*'), '', trim($result[1][$key])),
206 206
 						'method' => $method,
207 207
 						'parameters' => trim($result[3][$key])
208 208
 					);
4  cake/console/libs/shell.php
@@ -488,8 +488,8 @@ function _checkUnitTest() {
488 488
  */
489 489
 	function shortPath($file) {
490 490
 		$shortPath = str_replace(ROOT, null, $file);
491  
-		$shortPath = str_replace('..'.DS, '', $shortPath);
492  
-		return r(DS.DS, DS, $shortPath);
  491
+		$shortPath = str_replace('..' . DS, '', $shortPath);
  492
+		return str_replace(DS . DS, DS, $shortPath);
493 493
 	}
494 494
 /**
495 495
  * Checks for Configure::read('Routing.admin') and forces user to input it if not enabled
2  cake/libs/view/helpers/time.php
@@ -481,7 +481,7 @@ function relativeTime($dateTime, $options = array()) {
481 481
  * @return bool
482 482
  */
483 483
 	function wasWithinLast($timeInterval, $dateString, $userOffset = null) {
484  
-		$tmp = r(' ', '', $timeInterval);
  484
+		$tmp = str_replace(' ', '', $timeInterval);
485 485
 		if (is_numeric($tmp)) {
486 486
 			$timeInterval = $tmp . ' ' . __('days', true);
487 487
 		}

0 notes on commit 8f61c66

Please sign in to comment.
Something went wrong with that request. Please try again.