From d38cb920591debd8640b89d7b832537aee80fa07 Mon Sep 17 00:00:00 2001
From: "uwe.tews@googlemail.com" <uwe.tews@googlemail.com>
Date: Sun, 13 Feb 2011 22:04:58 +0000
Subject: [PATCH] - bufix replace $smarty->triggerError() by exception -
 removed obsolete {popup_init..} plugin from demo templates

---
 change_log.txt                                       | 3 +++
 libs/sysplugins/smarty_internal_resource_extends.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/change_log.txt b/change_log.txt
index 2b658bfa..6f0ac3be 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,7 @@
 ===== SVN trunk  =====
+13/02/2011
+- bufix replace $smarty->triggerError() by exception
+- removed obsolete {popup_init..} plugin from demo templates
 
 ===== Smarty 3.0.7  =====
 09/02/2011
diff --git a/libs/sysplugins/smarty_internal_resource_extends.php b/libs/sysplugins/smarty_internal_resource_extends.php
index 74dc0f9b..7f972c69 100644
--- a/libs/sysplugins/smarty_internal_resource_extends.php
+++ b/libs/sysplugins/smarty_internal_resource_extends.php
@@ -105,7 +105,7 @@ class Smarty_Internal_Resource_Extends {
             if ($_filepath != $_last) {
                 if (preg_match_all("!({$this->_ldl}block\s(.+?){$this->_rdl})!", $_content, $_open) !=
                         preg_match_all("!({$this->_ldl}/block{$this->_rdl})!", $_content, $_close)) {
-                    $this->smarty->triggerError("unmatched {block} {/block} pairs in file '$_filepath'");
+                    	throw new SmartyException("unmatched {block} {/block} pairs in file '$_filepath'");
                 } 
                 preg_match_all("!{$this->_ldl}block\s(.+?){$this->_rdl}|{$this->_ldl}/block{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
                 $_result_count = count($_result[0]);