From c6b4190fab88201f4efaa0d00a6aa823b180f482 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 10 Jun 2006 11:28:30 +0000
Subject: Merge from 3.0 branch till 1148.

---
 framework/Web/UI/TControl.php                |  2 +-
 framework/Web/UI/WebControls/TLinkButton.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'framework/Web/UI')

diff --git a/framework/Web/UI/TControl.php b/framework/Web/UI/TControl.php
index eced51ea..d5079382 100644
--- a/framework/Web/UI/TControl.php
+++ b/framework/Web/UI/TControl.php
@@ -1165,6 +1165,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
 	 */
 	protected function initRecursive($namingContainer=null)
 	{
+		$this->ensureChildControls();
 		if($this->getHasControls())
 		{
 			if($this instanceof INamingContainer)
@@ -1235,7 +1236,6 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
 
 		if($this->getVisible(false))
 		{
-			$this->ensureChildControls();
 			if(isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onPreRender(null);
 			else
diff --git a/framework/Web/UI/WebControls/TLinkButton.php b/framework/Web/UI/WebControls/TLinkButton.php
index 7f9baab8..7487b37a 100644
--- a/framework/Web/UI/WebControls/TLinkButton.php
+++ b/framework/Web/UI/WebControls/TLinkButton.php
@@ -85,18 +85,18 @@ class TLinkButton extends TWebControl implements IPostBackEventHandler, IButtonC
 		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled','disabled');
 	}
-	
+
 	/**
 	 * Renders the client-script code.
 	 */
 	protected function renderClientControlScript($writer)
 	{
 		//create unique no-op url references
-		$nop = "#".$this->getClientID();
+		$nop = "javascript:;//".$this->getClientID();
 		$writer->addAttribute('href', $nop);
-		$cs = $this->getPage()->getClientScript(); 
+		$cs = $this->getPage()->getClientScript();
 		$cs->registerPostBackControl(get_class($this),$this->getPostBackOptions());
-	}	
+	}
 
 	/**
 	 * Returns postback specifications for the button.
@@ -252,4 +252,4 @@ class TLinkButton extends TWebControl implements IPostBackEventHandler, IButtonC
 	}
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3