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

*** empty log message ***

Browse Source
This commit is contained in:
andrey
2001-12-03 20:53:56 +00:00
parent e7fd903125
commit 03107ad100
3 changed files with 58 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
NEWS
View File

@@ -1,10 +1,9 @@
- added trusted_dir functionality (Monte) - added trusted_dir functionality. (Monte)
- consolidated security tests to one function (Monte) - consolidated security tests to one function. (Monte)
- prepend SMARTY_DIR to default directories in class constructor (Monte, - prepend SMARTY_DIR to default directories in class constructor. (Monte,
Ricard Pillosu) Ricard Pillosu)
- append _smarty_ to variable names in fetch() class function to avoid - append _smarty_ to variable names in fetch() class function to avoid
namespace conflicts (Monte) namespace conflicts. (Monte)
- fixed bug in _rm_auto with catendated null values (Monte, Thomas Pundt)
- introduced $compile_id class variable that can be used to set persistent - introduced $compile_id class variable that can be used to set persistent
compile identifier across multiple display calls. (Andrei) compile identifier across multiple display calls. (Andrei)
- fixed bug with concatenated null cache and compile identifiers. (Andrei) - fixed bug with concatenated null cache and compile identifiers. (Andrei)

8
Smarty.class.php
View File

@@ -129,7 +129,7 @@ class Smarty
); );
var $trusted_dir = array(); // array of directories where trusted templates var $trusted_dir = array(); // array of directories where trusted templates
// reside ($security is disabled during their // reside ($security is disabled during their
// execution.) // execution).
var $left_delimiter = '{'; // template tag delimiters. var $left_delimiter = '{'; // template tag delimiters.
var $right_delimiter = '}'; var $right_delimiter = '}';
@@ -543,9 +543,11 @@ class Smarty
'depth' => 0); 'depth' => 0);
$included_tpls_idx = count($this->_smarty_debug_info) - 1; $included_tpls_idx = count($this->_smarty_debug_info) - 1;
} }
$this->_compile_id = $_smarty_compile_id;
$this->_inclusion_depth = 0;
if (!isset($_smarty_compile_id))
$_smarty_compile_id = $this->compile_id;
$this->_inclusion_depth = 0;
if ($this->caching) { if ($this->caching) {

8
libs/Smarty.class.php
View File

@@ -129,7 +129,7 @@ class Smarty
); );
var $trusted_dir = array(); // array of directories where trusted templates var $trusted_dir = array(); // array of directories where trusted templates
// reside ($security is disabled during their // reside ($security is disabled during their
// execution.) // execution).
var $left_delimiter = '{'; // template tag delimiters. var $left_delimiter = '{'; // template tag delimiters.
var $right_delimiter = '}'; var $right_delimiter = '}';
@@ -543,9 +543,11 @@ class Smarty
'depth' => 0); 'depth' => 0);
$included_tpls_idx = count($this->_smarty_debug_info) - 1; $included_tpls_idx = count($this->_smarty_debug_info) - 1;
} }
$this->_compile_id = $_smarty_compile_id;
$this->_inclusion_depth = 0;
if (!isset($_smarty_compile_id))
$_smarty_compile_id = $this->compile_id;
$this->_inclusion_depth = 0;
if ($this->caching) { if ($this->caching) {