summaryrefslogtreecommitdiff
path: root/libs/sysplugins
diff options
context:
space:
mode:
authoruwe.tews@googlemail.com <uwe.tews@googlemail.com>2011-02-13 22:04:58 +0000
committeruwe.tews@googlemail.com <uwe.tews@googlemail.com>2011-02-13 22:04:58 +0000
commitd38cb920591debd8640b89d7b832537aee80fa07 (patch)
tree1c30b4955742c183653be8eb00c946e084397bc1 /libs/sysplugins
parentbe268fe3b07fa73fa4458d18b903cccb5375721a (diff)
downloadsmarty-d38cb920591debd8640b89d7b832537aee80fa07.tar.gz
smarty-d38cb920591debd8640b89d7b832537aee80fa07.tar.bz2
smarty-d38cb920591debd8640b89d7b832537aee80fa07.zip
- bufix replace $smarty->triggerError() by exception
- removed obsolete {popup_init..} plugin from demo templates
Diffstat (limited to 'libs/sysplugins')
-rw-r--r--libs/sysplugins/smarty_internal_resource_extends.php2
1 files changed, 1 insertions, 1 deletions
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]);