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

- bugfix failure when the default resource type was set to 'extendsall' https://github.com/smarty-php/smarty/issues/123

Browse Source
This commit is contained in:
uwetews
2015-12-20 05:27:43 +01:00
parent dc9872e0e2
commit e655856871
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
 ===== 3.1.29-dev ===== (xx.xx.2015)  ===== 3.1.29-dev ===== (xx.xx.2015)
20.12.2015
- bugfix failure when the default resource type was set to 'extendsall' https://github.com/smarty-php/smarty/issues/123
19.12.2015 19.12.2015
- bugfix using $smarty.capture.foo in expressions could fail https://github.com/smarty-php/smarty/pull/138 - bugfix using $smarty.capture.foo in expressions could fail https://github.com/smarty-php/smarty/pull/138
- bugfix broken PHP 5.2 compatibility https://github.com/smarty-php/smarty/issues/139 - bugfix broken PHP 5.2 compatibility https://github.com/smarty-php/smarty/issues/139

2
libs/Smarty.class.php
View File

@@ -118,7 +118,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.29-dev/13'; const SMARTY_VERSION = '3.1.29-dev/14';
/** /**
* define variable scopes * define variable scopes

2
libs/sysplugins/smarty_internal_runtime_validatecompiled.php
View File

@@ -43,7 +43,7 @@ class Smarty_Internal_Runtime_ValidateCompiled
} elseif ($_file_to_check[2] == 'string') { } elseif ($_file_to_check[2] == 'string') {
continue; continue;
} else { } else {
$source = Smarty_Template_Source::load(null, $tpl->smarty, $_file_to_check[0]); $source = Smarty_Template_Source::load($tpl, $tpl->smarty, $_file_to_check[0]);
$mtime = $source->getTimeStamp(); $mtime = $source->getTimeStamp();
} }
if (!$mtime || $mtime > $_file_to_check[1]) { if (!$mtime || $mtime > $_file_to_check[1]) {