From 9c1c5f5c2f072ed8d69a321044af79bc7d9cfa68 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 11 Mar 2008 04:30:14 +0000
Subject: [PATCH] Merged revisions 50903 via svnmerge from
 http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50903 | sminnee | 2008-03-11 17:29:06 +1300 (Tue, 11 Mar 2008) | 1 line

  #2302 - Fixed double-escaping of CTF popup page-navigation links
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50898 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 forms/ComplexTableField.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms/ComplexTableField.php b/forms/ComplexTableField.php
index 046b21679..0cdf312ac 100755
--- a/forms/ComplexTableField.php
+++ b/forms/ComplexTableField.php
@@ -461,7 +461,7 @@ JS;
 	function PopupBaseLink() {
 		$link = $this->FormAction() . "&action_callfieldmethod&fieldName={$this->Name()}";
 		if(!strpos($link,'ctf[ID]')) {
-			$link = HTTP::setGetVar('ctf[ID]',$this->sourceID(),$link);
+			$link = str_replace('&amp;','&',HTTP::setGetVar('ctf[ID]',$this->sourceID(),$link));
 		}
 		return $link;
 	}