smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 10:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bufix replace $smarty->triggerError() by exception

Browse Source 
- removed obsolete {popup_init..} plugin from demo templates
This commit is contained in:
uwe.tews@googlemail.com
2011-02-13 22:04:58 +00:00
parent be268fe3b0
commit d38cb92059
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
===== SVN trunk ===== ===== SVN trunk =====
13/02/2011
- bufix replace $smarty->triggerError() by exception
- removed obsolete {popup_init..} plugin from demo templates
===== Smarty 3.0.7 ===== ===== Smarty 3.0.7 =====
09/02/2011 09/02/2011

2
libs/sysplugins/smarty_internal_resource_extends.php
View File

@@ -105,7 +105,7 @@ class Smarty_Internal_Resource_Extends {
if ($_filepath != $_last) { if ($_filepath != $_last) {
if (preg_match_all("!({$this->_ldl}block\s(.+?){$this->_rdl})!", $_content, $_open) != if (preg_match_all("!({$this->_ldl}block\s(.+?){$this->_rdl})!", $_content, $_open) !=
preg_match_all("!({$this->_ldl}/block{$this->_rdl})!", $_content, $_close)) { 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); preg_match_all("!{$this->_ldl}block\s(.+?){$this->_rdl}|{$this->_ldl}/block{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
$_result_count = count($_result[0]); $_result_count = count($_result[0]);