webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-09 05:02:44 +03:00
Code Activity

update Smarty to v3.1.33 - "This release does cover security issue CVE-2018-16831, other bug fixes (see changelog.txt) and adds a new feature of the {capture} tag (see NEW_FEATURES.txt)."

Browse Source
This commit is contained in:
David Goodwin
2019-09-25 13:55:07 +01:00
parent 7360407b73
commit 907bd7ee46
199 changed files with 5335 additions and 4857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php
View File

@@ -6,25 +6,24 @@
* @package Smarty
* @subpackage PluginsInternal
* @author Uwe Tews
*
**/
class Smarty_Internal_Runtime_UpdateScope
{
/**
* Update new assigned template or config variable in other effected scopes
*
* @param Smarty_Internal_Template $tpl data object
* @param string|null $varName variable name
* @param int $tagScope tag scope to which bubble up variable value
*
* @param Smarty_Internal_Template $tpl data object
* @param string|null $varName variable name
* @param int $tagScope tag scope to which bubble up variable value
*/
public function _updateScope(Smarty_Internal_Template $tpl, $varName, $tagScope = 0)
{
if ($tagScope) {
$this->_updateVarStack($tpl, $varName);
$tagScope = $tagScope & ~Smarty::SCOPE_LOCAL;
if (!$tpl->scope && !$tagScope) return;
if (!$tpl->scope && !$tagScope) {
return;
}
}
$mergedScope = $tagScope | $tpl->scope;
if ($mergedScope) {
@@ -34,8 +33,9 @@ class Smarty_Internal_Runtime_UpdateScope
// update scopes
foreach ($this->_getAffectedScopes($tpl, $mergedScope) as $ptr) {
$this->_updateVariableInOtherScope($ptr->tpl_vars, $tpl, $varName);
if($tagScope && $ptr->_isTplObj() && isset($tpl->_cache[ 'varStack' ])) {
$this->_updateVarStack($ptr, $varName); }
if ($tagScope && $ptr->_isTplObj() && isset($tpl->_cache[ 'varStack' ])) {
$this->_updateVarStack($ptr, $varName);
}
}
}
}
@@ -62,8 +62,8 @@ class Smarty_Internal_Runtime_UpdateScope
$ptr = $ptr->parent;
}
while (isset($ptr) && $ptr->_isTplObj()) {
$_stack[] = $ptr;
$ptr = $ptr->parent;
$_stack[] = $ptr;
$ptr = $ptr->parent;
}
if ($mergedScope & Smarty::SCOPE_SMARTY) {
if (isset($tpl->smarty)) {
@@ -84,9 +84,9 @@ class Smarty_Internal_Runtime_UpdateScope
/**
* Update variable in other scope
*
* @param array $tpl_vars template variable array
* @param array $tpl_vars template variable array
* @param \Smarty_Internal_Template $from
* @param string $varName variable name
* @param string $varName variable name
*/
public function _updateVariableInOtherScope(&$tpl_vars, Smarty_Internal_Template $from, $varName)
{
@@ -109,7 +109,7 @@ class Smarty_Internal_Runtime_UpdateScope
$i = 0;
while (isset($tpl->_cache[ 'varStack' ][ $i ])) {
$this->_updateVariableInOtherScope($tpl->_cache[ 'varStack' ][ $i ][ 'tpl' ], $tpl, $varName);
$i ++;
$i++;
}
}
}