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
This commit is contained in:
Sam Minnee 2008-03-11 04:30:14 +00:00
parent e9cb7638f7
commit 9c1c5f5c2f

View File

@ -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('&','&',HTTP::setGetVar('ctf[ID]',$this->sourceID(),$link));
}
return $link;
}