From 3850edb7440923c6296026c658d53f44faceff55 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 4 Nov 2006 03:33:00 +0000
Subject: merge from 3.0 branch till 1489.

---
 framework/Web/UI/TTemplateManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index 8c4983bf..950f2c70 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -746,7 +746,7 @@ class TTemplate extends TApplicationComponent implements ITemplate
 		}
 		catch(Exception $e)
 		{
-			if($e->getErrorCode()==='template_format_invalid' || $e->getErrorCode()==='template_format_invalid2')
+			if(($e instanceof TException) && ($e->getErrorCode()==='template_format_invalid' || $e->getErrorCode()==='template_format_invalid2'))
 				throw $e;
 			if($matchEnd===0)
 				$line=$this->_startingLine+1;
-- 
cgit v1.2.3