From 7114280214ab22250c3ddd12509c2e388936a304 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Wed, 3 Oct 2007 21:12:33 +0000
Subject: Changed TConditional so that the controls in its template behave like
 they are in its parent

---
 framework/Web/UI/TTemplateManager.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'framework/Web/UI/TTemplateManager.php')

diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index 34d66b47..53058a9f 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -303,10 +303,13 @@ class TTemplate extends TApplicationComponent implements ITemplate
 	 * Content in the template will be instantiated as components and text strings
 	 * and passed to the specified parent control.
 	 * @param TControl the parent control
+	 * @param TControl the control with which explicitly named controls are registered. If null, it uses the parent control.
 	 */
-	public function instantiateIn($tplControl)
+	public function instantiateIn($tplControl,$namingControl=null)
 	{
 		$this->_tplControl=$tplControl;
+		if($namingControl===null)
+			$namingControl=$tplControl;
 		if(($page=$tplControl->getPage())===null)
 			$page=$this->getService()->getRequestedPage();
 		$controls=array();
@@ -332,7 +335,7 @@ class TTemplate extends TApplicationComponent implements ITemplate
 					{
 						if(is_array($properties['id']))
 							$properties['id']=$component->evaluateExpression($properties['id'][1]);
-						$tplControl->registerObject($properties['id'],$component);
+						$namingControl->registerObject($properties['id'],$component);
 					}
 					if(isset($properties['skinid']))
 					{
@@ -365,7 +368,7 @@ class TTemplate extends TApplicationComponent implements ITemplate
 					{
 						if(is_array($properties['id']))
 							$properties['id']=$component->evaluateExpression($properties['id'][1]);
-						$tplControl->registerObject($properties['id'],$component);
+						$namingControl->registerObject($properties['id'],$component);
 						if(!$component->hasProperty('id'))
 							unset($properties['id']);
 					}
-- 
cgit v1.2.3