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

back out third parameter, extend functionality of append

Browse Source
This commit is contained in:
mohrt
2003-02-19 23:05:46 +00:00
parent 7f0ceb703a
commit 2b10dfd70d
2 changed files with 52 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Smarty.class.php
View File

@@ -578,8 +578,9 @@ class Smarty
} }
} }
} else { } else {
if ($tpl_var != '') if ($tpl_var != '') {
$this->_tpl_vars[$tpl_var] = $value; $this->_tpl_vars[$tpl_var] = $value;
}
} }
} }
@@ -600,31 +601,32 @@ class Smarty
* *
* @param array|string $tpl_var the template variable name(s) * @param array|string $tpl_var the template variable name(s)
* @param mixed $value the value to append * @param mixed $value the value to append
* @param mixed $key the key of value to append
*/ */
function append($tpl_var, $value = null, $key=null) function append($tpl_var, $value = null)
{ {
if (is_array($tpl_var)) { if (is_array($tpl_var)) {
foreach ($tpl_var as $name=>$val) { foreach ($tpl_var as $key => $val) {
if ($var_name != '') { if ($key != '') {
if(!@is_array($this->_tpl_vars[$name])) { if(!@is_array($this->_tpl_vars[$key])) {
settype($this->_tpl_vars[$name],'array'); settype($this->_tpl_vars[$key],'array');
} }
if (isset($key)) if(@is_array($val)) {
$this->_tpl_vars[$name][$key] = $val; $this->_tpl_vars[$key] = array_merge($this->_tpl_vars[$key],$val);
else } else {
$this->_tpl_vars[$name][] = $val; $this->_tpl_vars[$key][] = $val;
}
} }
} }
} else { } else {
if ($tpl_var != '' && isset($value)) { if ($tpl_var != '' && isset($value)) {
if(!@is_array($this->_tpl_vars[$tpl_var])) { if(!@is_array($this->_tpl_vars[$tpl_var])) {
settype($this->_tpl_vars[$tpl_var],'array'); settype($this->_tpl_vars[$tpl_var],'array');
} }
if (isset($key)) if(@is_array($value)) {
$this->_tpl_vars[$tpl_var][$key] = $value; $this->_tpl_vars[$tpl_var] = array_merge($this->_tpl_vars[$tpl_var],$value);
else } else {
$this->_tpl_vars[$tpl_var][] = $value; $this->_tpl_vars[$tpl_var][] = $value;
}
} }
} }
} }
@@ -634,18 +636,14 @@ class Smarty
* *
* @param string $tpl_var the template variable name * @param string $tpl_var the template variable name
* @param mixed $value the referenced value to append * @param mixed $value the referenced value to append
* @param mixed $key the key of value to append
*/ */
function append_by_ref($tpl_var, &$value, $key=null) function append_by_ref($tpl_var, &$value)
{ {
if ($tpl_var != '' && isset($value)) { if ($tpl_var != '' && isset($value)) {
if(!@is_array($this->_tpl_vars[$tpl_var])) { if(!@is_array($this->_tpl_vars[$tpl_var])) {
settype($this->_tpl_vars[$tpl_var],'array'); settype($this->_tpl_vars[$tpl_var],'array');
} }
if (isset($key)) $this->_tpl_vars[$tpl_var][] = &$value;
$this->_tpl_vars[$tpl_var][$key] = &$value;
else
$this->_tpl_vars[$tpl_var][] = &$value;
} }
} }

54
libs/Smarty.class.php
View File

@@ -578,8 +578,9 @@ class Smarty
} }
} }
} else { } else {
if ($tpl_var != '') if ($tpl_var != '') {
$this->_tpl_vars[$tpl_var] = $value; $this->_tpl_vars[$tpl_var] = $value;
}
} }
} }
@@ -600,31 +601,32 @@ class Smarty
* *
* @param array|string $tpl_var the template variable name(s) * @param array|string $tpl_var the template variable name(s)
* @param mixed $value the value to append * @param mixed $value the value to append
* @param mixed $key the key of value to append
*/ */
function append($tpl_var, $value = null, $key=null) function append($tpl_var, $value = null)
{ {
if (is_array($tpl_var)) { if (is_array($tpl_var)) {
foreach ($tpl_var as $name=>$val) { foreach ($tpl_var as $key => $val) {
if ($var_name != '') { if ($key != '') {
if(!@is_array($this->_tpl_vars[$name])) { if(!@is_array($this->_tpl_vars[$key])) {
settype($this->_tpl_vars[$name],'array'); settype($this->_tpl_vars[$key],'array');
} }
if (isset($key)) if(@is_array($val)) {
$this->_tpl_vars[$name][$key] = $val; $this->_tpl_vars[$key] = array_merge($this->_tpl_vars[$key],$val);
else } else {
$this->_tpl_vars[$name][] = $val; $this->_tpl_vars[$key][] = $val;
}
} }
} }
} else { } else {
if ($tpl_var != '' && isset($value)) { if ($tpl_var != '' && isset($value)) {
if(!@is_array($this->_tpl_vars[$tpl_var])) { if(!@is_array($this->_tpl_vars[$tpl_var])) {
settype($this->_tpl_vars[$tpl_var],'array'); settype($this->_tpl_vars[$tpl_var],'array');
} }
if (isset($key)) if(@is_array($value)) {
$this->_tpl_vars[$tpl_var][$key] = $value; $this->_tpl_vars[$tpl_var] = array_merge($this->_tpl_vars[$tpl_var],$value);
else } else {
$this->_tpl_vars[$tpl_var][] = $value; $this->_tpl_vars[$tpl_var][] = $value;
}
} }
} }
} }
@@ -634,18 +636,14 @@ class Smarty
* *
* @param string $tpl_var the template variable name * @param string $tpl_var the template variable name
* @param mixed $value the referenced value to append * @param mixed $value the referenced value to append
* @param mixed $key the key of value to append
*/ */
function append_by_ref($tpl_var, &$value, $key=null) function append_by_ref($tpl_var, &$value)
{ {
if ($tpl_var != '' && isset($value)) { if ($tpl_var != '' && isset($value)) {
if(!@is_array($this->_tpl_vars[$tpl_var])) { if(!@is_array($this->_tpl_vars[$tpl_var])) {
settype($this->_tpl_vars[$tpl_var],'array'); settype($this->_tpl_vars[$tpl_var],'array');
} }
if (isset($key)) $this->_tpl_vars[$tpl_var][] = &$value;
$this->_tpl_vars[$tpl_var][$key] = &$value;
else
$this->_tpl_vars[$tpl_var][] = &$value;
} }
} }