summaryrefslogtreecommitdiff
path: root/framework/Web/UI
diff options
context:
space:
mode:
authorxue <>2006-04-11 17:35:10 +0000
committerxue <>2006-04-11 17:35:10 +0000
commit64cc0b33281efbef56fbd6495f433906eda50636 (patch)
treed2699404de4c37fb64abd70b234fbd592a28c761 /framework/Web/UI
parent293fd30c134997b28836ca879a99bd933ec7cbe3 (diff)
Merge from 3.0 branch till 894.
Diffstat (limited to 'framework/Web/UI')
-rw-r--r--framework/Web/UI/TControl.php2
-rw-r--r--framework/Web/UI/WebControls/TWizard.php2
2 files changed, 2 insertions, 2 deletions
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);
}