Browse Source

Replacing request->here with request->here(). Saves a call to Router::normalize() in a few places.

mark_story 15 years ago
parent
commit
5e3cd74b03
2 changed files with 5 additions and 5 deletions
  1. 3 3
      cake/libs/error/exception_renderer.php
  2. 2 2
      cake/libs/view/helpers/cache.php

+ 3 - 3
cake/libs/error/exception_renderer.php

@@ -172,7 +172,7 @@ class ExceptionRenderer {
  * @return void
  */
 	protected function _cakeError(CakeException $error) {
-		$url = Router::normalize($this->controller->request->here);
+		$url = $this->controller->request->here();
 		$code = $error->getCode();
 		$this->controller->response->statusCode($code);
 		$this->controller->set(array(
@@ -195,7 +195,7 @@ class ExceptionRenderer {
 		if (Configure::read('debug') == 0 && $error instanceof CakeException) {
 			$message = __('Not Found');
 		}
-		$url = Router::normalize($this->controller->request->here);
+		$url = $this->controller->request->here();
 		$this->controller->response->statusCode($error->getCode());
 		$this->controller->set(array(
 			'name' => $message,
@@ -211,7 +211,7 @@ class ExceptionRenderer {
  * @param array $params Parameters for controller
  */
 	public function error500($error) {
-		$url = Router::normalize($this->controller->request->here);
+		$url = $this->controller->request->here();
 		$code = ($error->getCode() > 500) ? $error->getCode() : 500;
 		$this->controller->response->statusCode($code);
 		$this->controller->set(array(

+ 2 - 2
cake/libs/view/helpers/cache.php

@@ -213,8 +213,8 @@ class CacheHelper extends AppHelper {
 		} else {
 			$cacheTime = strtotime($timestamp, $now);
 		}
-		$path = $this->request->here;
-		if ($this->here == '/') {
+		$path = $this->request->here();
+		if ($path == '/') {
 			$path = 'home';
 		}
 		$cache = strtolower(Inflector::slug($path));