From 64cc0b33281efbef56fbd6495f433906eda50636 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 11 Apr 2006 17:35:10 +0000
Subject: Merge from 3.0 branch till 894.

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

(limited to 'framework')

diff --git a/framework/Web/UI/TControl.php b/framework/Web/UI/TControl.php
index cc6a6740..78c5bdfc 100644
--- a/framework/Web/UI/TControl.php
+++ b/framework/Web/UI/TControl.php
@@ -1103,7 +1103,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
 		$control->_page=null;
 		$control->_namingContainer=null;
 		$control->_tplControl=null;
-		$control->_stage=self::CS_CONSTRUCTED;
+		//$control->_stage=self::CS_CONSTRUCTED;
 		if(!($control->_flags & self::IS_ID_SET))
 			$control->_id='';
 		else
diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index 0b44872b..794fb4da 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -188,7 +188,7 @@ class TWizard extends TWebControl implements INamingContainer
 	 */
 	public function addParsedObject($object)
 	{
-		if(is_object($object))
+		if($object instanceof TWizardStep)
 			$this->getWizardSteps()->add($object);
 	}
 
-- 
cgit v1.2.3