2 files changed, 6 insertions, 1 deletions

diff --git a/framework/Web/UI/WebControls/TContent.php b/framework/Web/UI/WebControls/TContent.php
index 20cd1dc5..d02d3b4d 100644
--- a/framework/Web/UI/WebControls/TContent.php
+++ b/framework/Web/UI/WebControls/TContent.php
@@ -39,6 +39,8 @@ class TContent extends TControl implements INamingContainer
 	 */

 	public function createdOnTemplate($parent)

 	{

+		if(($id=$this->getID())==='')

+			throw new TConfigurationException('content_id_required');

 		$this->getTemplateControl()->registerContent($this);

 		parent::createdOnTemplate($parent);

 	}

diff --git a/framework/Web/UI/WebControls/TContentPlaceHolder.php b/framework/Web/UI/WebControls/TContentPlaceHolder.php
index 32106e82..a13e85bc 100644
--- a/framework/Web/UI/WebControls/TContentPlaceHolder.php
+++ b/framework/Web/UI/WebControls/TContentPlaceHolder.php
@@ -39,8 +39,11 @@ class TContentPlaceHolder extends TControl
 	 */

 	public function createdOnTemplate($parent)

 	{

+		if(($id=$this->getID())==='')

+			throw new TConfigurationException('contentplaceholder_id_required');

 		$loc=$parent->getHasControls()?$parent->getControls()->getCount():0;

-		$this->getTemplateControl()->registerContentPlaceHolder($this->getID(),$parent,$loc);

+		$this->getTemplateControl()->registerContentPlaceHolder($id,$parent,$loc);

+		$parent->unregisterObject($id);

 	}

 }