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

* fixed plugin filepath cache must not be static, because of possible problem

Browse Source 
when using multiple Smarty instances with diffrent plugins_dir settings
         https://github.com/smarty-php/smarty/issues/146
This commit is contained in:
uwetews
2015-12-30 17:07:54 +01:00
parent 47fa66cdcf
commit 4cb07a89e2
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2015-12-30 Uwe Tews
* fixed plugin filepath cache must not be static, because of possible problem
when using multiple Smarty instances with diffrent plugins_dir settings
https://github.com/smarty-php/smarty/issues/146
2015-06-21 Uwe Tews
* PHP7 raises E_DEPRECATED use __construct for compatibility

6
libs/Smarty.class.php
View File

@@ -562,6 +562,12 @@ class Smarty
*/
var $_cache_including = false;
/**
* plugin filepath cache
*
* @var array
*/
var $_filepaths_cache = array();
/**#@-*/
/**
* The class constructor.

8
libs/internals/core.assemble_plugin_filepath.php
View File

@@ -14,11 +14,9 @@
*/
function smarty_core_assemble_plugin_filepath($params, &$smarty)
{
static $_filepaths_cache = array();
$_plugin_filename = $params['type'] . '.' . $params['name'] . '.php';
if (isset($_filepaths_cache[$_plugin_filename])) {
return $_filepaths_cache[$_plugin_filename];
if (isset($smarty->_filepaths_cache[$_plugin_filename])) {
return $smarty->_filepaths_cache[$_plugin_filename];
}
$_return = false;
@@ -58,7 +56,7 @@ function smarty_core_assemble_plugin_filepath($params, &$smarty)
}
}
}
$_filepaths_cache[$_plugin_filename] = $_return;
$smarty->_filepaths_cache[$_plugin_filename] = $_return;
return $_return;
}