From a5ba85214c1d062f3726d3e2fa295539c6ccc33c Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 17 Jul 2007 17:43:16 +0000
Subject: Fixed #662.

---
 HISTORY                    | 1 +
 framework/Web/UI/TForm.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/HISTORY b/HISTORY
index 59688d03..d14d196b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 Version 3.1.1 To be released
 ============================
 BUG: Ticket#656 - TDatePicker does not return correct value when in callback mode (Christophe)
+BUG: Ticket#662 - Ensure TForm to properly encode the ampersand in action URL (Qiang)
 BUG: Ticket#670 - TDatePicker: Year Issue (Christophe)
 ENH: Ticket#667 - Added TFeedService.ContentType property (Qiang)
 ENH: Added THead requirement check (Qiang)
diff --git a/framework/Web/UI/TForm.php b/framework/Web/UI/TForm.php
index 2cfa5547..324156fa 100644
--- a/framework/Web/UI/TForm.php
+++ b/framework/Web/UI/TForm.php
@@ -47,7 +47,8 @@ class TForm extends TControl
 	{
 		$writer->addAttribute('id',$this->getClientID());
 		$writer->addAttribute('method',$this->getMethod());
-		$writer->addAttribute('action',$this->getRequest()->getRequestURI());
+		$uri=$this->getRequest()->getRequestURI();
+		$writer->addAttribute('action',str_replace('&','&amp;',str_replace('&amp;','&',$uri)));
 		if(($enctype=$this->getEnctype())!=='')
 			$writer->addAttribute('enctype',$enctype);
 
-- 
cgit v1.2.3