diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php
index 7d4c0bc1f..ce846cb07 100644
--- a/cake/libs/view/helpers/ajax.php
+++ b/cake/libs/view/helpers/ajax.php
@@ -202,19 +202,18 @@ class AjaxHelper extends AppHelper {
  *						initiated and before <i>loading</i>.
  *
  * @param string $title Title of link
- * @param string $href Href string "/products/view/12"
- * @param array $options		Options for JavaScript function
- * @param string $confirm		Confirmation message. Calls up a JavaScript confirm() message.
- * @param boolean $escapeTitle  Escaping the title string to HTML entities
+ * @param mixed $url Cake-relative URL or array of URL parameters, or external URL (starts with http://)
+ * @param array $options Options for JavaScript function
+ * @param string $confirm Confirmation message. Calls up a JavaScript confirm() message.
  *
- * @return string				HTML code for link to remote action
+ * @return string HTML code for link to remote action
  */
-	function link($title, $href = null, $options = array(), $confirm = null, $escapeTitle = true) {
-		if (!isset($href)) {
-			$href = $title;
+	function link($title, $url = null, $options = array(), $confirm = null) {
+		if (!isset($url)) {
+			$url = $title;
 		}
 		if (!isset($options['url'])) {
-			$options['url'] = $href;
+			$options['url'] = $url;
 		}
 
 		if (isset($confirm)) {
@@ -223,14 +222,15 @@ class AjaxHelper extends AppHelper {
 		}
 		$htmlOptions = $this->__getHtmlOptions($options, array('url'));
 
+		unset($options['escape']);
 		if (empty($options['fallback']) || !isset($options['fallback'])) {
-			$options['fallback'] = $href;
+			$options['fallback'] = $url;
 		}
 		$htmlDefaults = array('id' => 'link' . intval(mt_rand()), 'onclick' => '');
 		$htmlOptions = array_merge($htmlDefaults, $htmlOptions);
 
 		$htmlOptions['onclick'] .= ' event.returnValue = false; return false;';
-		$return = $this->Html->link($title, $href, $htmlOptions, null, $escapeTitle);
+		$return = $this->Html->link($title, $url, $htmlOptions);
 		$callback = $this->remoteFunction($options);
 		$script = $this->Javascript->event("'{$htmlOptions['id']}'", "click", $callback);
 
diff --git a/cake/tests/cases/libs/view/helpers/ajax.test.php b/cake/tests/cases/libs/view/helpers/ajax.test.php
index a2f36f8ea..9ccdaa8ef 100644
--- a/cake/tests/cases/libs/view/helpers/ajax.test.php
+++ b/cake/tests/cases/libs/view/helpers/ajax.test.php
@@ -548,6 +548,14 @@ class AjaxHelperTest extends CakeTestCase {
 		$this->assertPattern("/Event.observe\('link[0-9]+', [\w\d,'\(\)\s{}]+Ajax\.Request\([\w\d\s,'\(\){}:\/]+onComplete:function\(request, json\) {test}/", $result);
 		$this->assertNoPattern('/^<a[^<>]+complete="test"[^<>]*>Ajax Link<\/a>/', $result);
 		$this->assertNoPattern('/^<a\s+[^<>]*url="[^"]*"[^<>]*>/', $result);
+
+		$result = $this->Ajax->link('A & B', array('controller' => 'foo', 'action' => 'index'), array('escape' => false));
+		$this->assertPattern('/^<a[^<>]+>A & B<\/a><script [^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*[^<>]+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern("/Event.observe\('link[0-9]+', [\w\d,'\(\)\s{}]+Ajax\.Request\([\w\d\s,'\(\){}:\/]/", $result);
+		$this->assertPattern('/^<a[^<>]+href="\/foo"[^<>]*>/', $result);
+
+		$result = $this->Ajax->link('A & B', array('controller' => 'foo', 'action' => 'index'));
+		$this->assertPattern('/^<a[^<>]+>A &amp; B<\/a><script [^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*[^<>]+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
 	}
 /**
  * testRemoteTimer method