From c00193d23726bcb05b1fe53c4dfb3fc38b0a22e5 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 4 May 2006 03:08:35 +0000
Subject: Fixed a merge error.

---
 framework/Web/UI/TTemplateManager.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'framework/Web')

diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index b29466ad..36562b1b 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -338,7 +338,7 @@ class TTemplate extends TApplicationComponent implements ITemplate
 						$parent->addParsedObject($component);
 				}
 			}
-			else if($object[1] instanceof TCompositeLiteral)
+			else
 			{
 				if($object[1] instanceof TCompositeLiteral)
 				{
@@ -358,8 +358,6 @@ class TTemplate extends TApplicationComponent implements ITemplate
 						$parent->addParsedObject($object[1]);
 				}
 			}
-			else
-				throw new TConfigurationException('template_content_unexpected',(string)$object[1]);
 		}
 		// delay setting parent till now because the parent may cause
 		// the child to do lifecycle catchup which may cause problem
-- 
cgit v1.2.3