summaryrefslogtreecommitdiff
path: root/framework/Web
diff options
context:
space:
mode:
authorxue <>2006-05-04 03:08:35 +0000
committerxue <>2006-05-04 03:08:35 +0000
commitc00193d23726bcb05b1fe53c4dfb3fc38b0a22e5 (patch)
tree78c64a5e31729b73bf8da548104db51502f6ec64 /framework/Web
parent27478826035da62e1cba07833101b162558f895a (diff)
Fixed a merge error.
Diffstat (limited to 'framework/Web')
-rw-r--r--framework/Web/UI/TTemplateManager.php4
1 files changed, 1 insertions, 3 deletions
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