summaryrefslogtreecommitdiff
path: root/framework/Web/UI/WebControls
diff options
context:
space:
mode:
Diffstat (limited to 'framework/Web/UI/WebControls')
-rw-r--r--framework/Web/UI/WebControls/TContent.php2
-rw-r--r--framework/Web/UI/WebControls/TContentPlaceHolder.php5
2 files changed, 3 insertions, 4 deletions
diff --git a/framework/Web/UI/WebControls/TContent.php b/framework/Web/UI/WebControls/TContent.php
index f2c6f0ac..0ccc57f8 100644
--- a/framework/Web/UI/WebControls/TContent.php
+++ b/framework/Web/UI/WebControls/TContent.php
@@ -41,7 +41,7 @@ class TContent extends TControl implements INamingContainer
{
if(($id=$this->getID())==='')
throw new TConfigurationException('content_id_required');
- $this->getTemplateControl()->registerContent($this);
+ $this->getTemplateControl()->registerContent($id,$this);
}
}
diff --git a/framework/Web/UI/WebControls/TContentPlaceHolder.php b/framework/Web/UI/WebControls/TContentPlaceHolder.php
index a13e85bc..9cf5068c 100644
--- a/framework/Web/UI/WebControls/TContentPlaceHolder.php
+++ b/framework/Web/UI/WebControls/TContentPlaceHolder.php
@@ -41,9 +41,8 @@ class TContentPlaceHolder extends TControl
{
if(($id=$this->getID())==='')
throw new TConfigurationException('contentplaceholder_id_required');
- $loc=$parent->getHasControls()?$parent->getControls()->getCount():0;
- $this->getTemplateControl()->registerContentPlaceHolder($id,$parent,$loc);
- $parent->unregisterObject($id);
+ $this->getTemplateControl()->registerContentPlaceHolder($id,$this);
+ $parent->getControls()->add($this);
}
}