From 325784e87947dc4bde4fdcb76dfcee2416aec28d Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 12 Jan 2006 20:29:32 +0000
Subject: Fixed an issue about Master/Content.

---
 framework/Web/UI/TControl.php             | 1 +
 framework/Web/UI/WebControls/TContent.php | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/Web/UI/TControl.php b/framework/Web/UI/TControl.php
index 18b7d1e0..d6e1889d 100644
--- a/framework/Web/UI/TControl.php
+++ b/framework/Web/UI/TControl.php
@@ -990,6 +990,7 @@ class TControl extends TComponent
 		$control->_page=null;
 		$control->_namingContainer=null;
 		$control->_tplControl=null;
+		$control->_stage=self::CS_CONSTRUCTED;
 		if(!($control->_flags & self::IS_ID_SET))
 			$control->_id='';
 		$control->clearCachedUniqueID(true);
diff --git a/framework/Web/UI/WebControls/TContent.php b/framework/Web/UI/WebControls/TContent.php
index d02d3b4d..f2c6f0ac 100644
--- a/framework/Web/UI/WebControls/TContent.php
+++ b/framework/Web/UI/WebControls/TContent.php
@@ -42,7 +42,6 @@ class TContent extends TControl implements INamingContainer
 		if(($id=$this->getID())==='')
 			throw new TConfigurationException('content_id_required');
 		$this->getTemplateControl()->registerContent($this);
-		parent::createdOnTemplate($parent);
 	}
 }
 
-- 
cgit v1.2.3