From 85492fba92f43d52e1df020ac6ad4d40f5ae90ef Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Thu, 21 Jun 2007 06:47:57 +0000
Subject: [PATCH] Adding fix for Ticket #2750, fixes rendering of links when
 requestAction() is used. Router::url() replaced $_this with $this which is an
 instance of the class from which the method is called, in the case of this
 ticket it was an instance of the HtmlHelper

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5319 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/router.php      | 8 ++++----
 cake/libs/view/helper.php | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cake/libs/router.php b/cake/libs/router.php
index bb57097fb..d29d7b6fd 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -458,18 +458,18 @@ class Router extends Object {
 		$defaults = $params = array('plugin' => null, 'controller' => null, 'action' => 'index');
 
 		if (!empty($_this->__params)) {
-			if (!isset($_this->params['requested'])) {
+			if (!isset($this->params['requested'])) {
 				$params = $_this->__params[0];
-			} elseif (isset($_this->params['requested'])) {
+			} elseif (isset($this->params['requested'])) {
 				$params = end($_this->__params);
 			}
 		}
 		$path = array('base' => null);
 
 		if (!empty($_this->__paths)) {
-			if (!isset($_this->params['requested'])) {
+			if (!isset($this->params['requested'])) {
 				$path = $_this->__paths[0];
-			} elseif (isset($_this->params['requested'])) {
+			} elseif (isset($this->params['requested'])) {
 				$path = end($_this->__paths);
 			}
 		}
diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index 913136653..c12e44fdc 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -304,14 +304,14 @@ class Helper extends Overloadable {
  */
 	function setFormTag($tagValue) {
 		$view =& ClassRegistry::getObject('view');
-		
+
 		if ($tagValue === null) {
 			$view->model = null;
 			$view->association = null;
 			$view->modelId = null;
 			return;
 		}
-		
+
 		$parts = preg_split('/\/|\./', $tagValue);
 		$view->association = null;
 		if (count($parts) == 1) {
@@ -347,7 +347,7 @@ class Helper extends Overloadable {
 		} else {
 			return $view->association;
 		}
-	}	
+	}
 /**
  * Gets the ID of the currently-used model of the rendering context.
  *