From 10ae6ed6ee263644d3d7780153520af76215d178 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 6 Dec 2005 15:47:03 +0000
Subject:

---
 framework/Web/THttpRequest.php            | 4 ++--
 framework/Web/UI/TClientScriptManager.php | 4 ++--
 framework/Web/UI/TForm.php                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'framework')

diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php
index bd61765c..80e87d15 100644
--- a/framework/Web/THttpRequest.php
+++ b/framework/Web/THttpRequest.php
@@ -369,10 +369,10 @@ class THttpRequest extends TComponent implements IModule
 		if(is_array($getItems) || $getItems instanceof Traversable)
 		{
 			foreach($getItems as $name=>$value)
-				$url.='&'.urlencode($name).'='.urlencode($value);
+				$url.='&amp;'.urlencode($name).'='.urlencode($value);
 		}
 		if(defined('SID') && SID != '')
-			$url.='&'.SID;
+			$url.='&amp;'.SID;
 		return $url;
 	}
 
diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php
index bb8c44a3..03ac8479 100644
--- a/framework/Web/UI/TClientScriptManager.php
+++ b/framework/Web/UI/TClientScriptManager.php
@@ -97,7 +97,7 @@ class TClientScriptManager extends TComponent
 		if(!$options || (!$options->getPerformValidation() && !$options->getTrackFocus() && $options->getClientSubmit() && $options->getActionUrl()==''))
 		{
 			$this->registerPostBackScript();
-			$formID=$this->_page->getForm()->getUniqueID();
+			$formID=$this->_page->getForm()->getClientID();
 			$postback=self::POSTBACK_FUNC.'(\''.$formID.'\',\''.$control->getUniqueID().'\',\''.THttpUtility::quoteJavaScriptString($parameter).'\')';
 			if($options && $options->getAutoPostBack())
 				$postback='setTimeout(\''.THttpUtility::quoteJavaScriptString($postback).'\',0)';
@@ -308,7 +308,7 @@ class TClientScriptManager extends TComponent
 			$str.="<input type=\"hidden\" name=\"$name\" id=\"$name\" value=\"$value\" />\n";
 		}
 		if($str!=='')
-			$writer->write($str);
+			$writer->write("<div>\n".$str."</div>\n");
 	}
 
 	public function renderExpandoAttributes($writer)
diff --git a/framework/Web/UI/TForm.php b/framework/Web/UI/TForm.php
index 4c619299..72eb2e10 100644
--- a/framework/Web/UI/TForm.php
+++ b/framework/Web/UI/TForm.php
@@ -11,7 +11,7 @@ class TForm extends TControl
 	protected function addAttributesToRender($writer)
 	{
 		$attributes=$this->getAttributes();
-		$writer->addAttribute('name',$this->getName());
+//		$writer->addAttribute('name',$this->getName());
 		$writer->addAttribute('method',$this->getMethod());
 		$writer->addAttribute('action',$this->getApplication()->getRequest()->getRequestURI());
 		$attributes->remove('name');
@@ -41,7 +41,7 @@ class TForm extends TControl
 			else
 				throw new Exception('Only IButtonControl can be default button.');
 		}
-		$writer->addAttribute('id',$this->getUniqueID());
+		$writer->addAttribute('id',$this->getClientID());
 		foreach($attributes as $name=>$value)
 			$writer->addAttribute($name,$value);
 	}
-- 
cgit v1.2.3