From 1d2af84bffb5703a9bbd6bc5b07f983f22f3c369 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 9 Mar 2007 21:49:48 +0000
Subject: merge from 3.0 branch till 1755.

---
 HISTORY                                       | 1 +
 framework/Web/UI/WebControls/TCheckBox.php    | 3 ++-
 framework/Web/UI/WebControls/THiddenField.php | 7 +++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/HISTORY b/HISTORY
index 00ab2908..9975aff9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -52,6 +52,7 @@ Version 3.0.7 to be released
 BUG: Ticket#481 - Unable to cancel navigation when handling OnSideBarButtonClickEvent (Qiang)
 BUG: Ticket#505 - cultureInfo::getEnglishName does not return an arrary (Wei)
 BUG: Ticket#508 - CultureInfo class: PHP Notice because of missing static declaration (Wei)
+BUG: Ticket#558 - TRadionButtonList generates a empty onclick attribute (Qiang)
 BUG: typo in THttpResponse.writeFile() about sending headers (Qiang)
 
 Version 3.0.6 December 4, 2006
diff --git a/framework/Web/UI/WebControls/TCheckBox.php b/framework/Web/UI/WebControls/TCheckBox.php
index df90fc9a..bf2f9d05 100644
--- a/framework/Web/UI/WebControls/TCheckBox.php
+++ b/framework/Web/UI/WebControls/TCheckBox.php
@@ -280,7 +280,8 @@ class TCheckBox extends TWebControl implements IPostBackDataHandler, IValidatabl
 			$attributes=$this->getAttributes();
 			$value=$attributes->remove('value');
 			// onclick js should only be added to input tag
-			$onclick=$attributes->remove('onclick');
+			if(($onclick=$attributes->remove('onclick'))===null)
+				$onclick='';
 			if($attributes->getCount())
 			{
 				$writer->addAttributes($attributes);
diff --git a/framework/Web/UI/WebControls/THiddenField.php b/framework/Web/UI/WebControls/THiddenField.php
index 8a8a0c8a..acead9f0 100644
--- a/framework/Web/UI/WebControls/THiddenField.php
+++ b/framework/Web/UI/WebControls/THiddenField.php
@@ -59,6 +59,13 @@ class THiddenField extends TControl implements IPostBackDataHandler, IValidatabl
 			$writer->addAttribute('id',$this->getClientID());
 		if(($value=$this->getValue())!=='')
 			$writer->addAttribute('value',$value);
+
+		if($this->getHasAttributes())
+		{
+			foreach($this->getAttributes() as $name=>$value)
+				$writer->addAttribute($name,$value);
+		}
+
 		$writer->renderBeginTag('input');
 		$writer->renderEndTag();
 	}
-- 
cgit v1.2.3