diff options
| author | tony baldwin <tonybaldwin@gmx.com> | 2012-03-21 01:36:23 -0400 |
|---|---|---|
| committer | tony baldwin <tonybaldwin@gmx.com> | 2012-03-21 01:36:23 -0400 |
| commit | e5c29fcc786cee73c08247824cb87e9ed65a2c36 (patch) | |
| tree | 1e5a6fcf5ba20e5effdd60e6d6ffa5fadb11d9d7 /include/template_processor.php | |
| parent | cf17606d0f6200296b1e6d67f9ae3fb797e0df69 (diff) | |
| parent | b4a2dae0850ed72b61b008e44efa98f300ccd640 (diff) | |
| download | volse-hubzilla-e5c29fcc786cee73c08247824cb87e9ed65a2c36.tar.gz volse-hubzilla-e5c29fcc786cee73c08247824cb87e9ed65a2c36.tar.bz2 volse-hubzilla-e5c29fcc786cee73c08247824cb87e9ed65a2c36.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/template_processor.php')
| -rwxr-xr-x | include/template_processor.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/template_processor.php b/include/template_processor.php index 7f7b0b55b..4c317efe1 100755 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -96,7 +96,7 @@ $this->_push_stack(); $r = $this->r; $r[$varname] = $v; - if ($keyname!='') $r[$keyname] = $k; + if ($keyname!='') $r[$keyname] = (($k === 0) ? '0' : $k); $ret .= $this->replace($args[3], $r); $this->_pop_stack(); } @@ -203,7 +203,7 @@ $os=$s; $count++; $s = $this->var_replace($s); } - return template_unescape($s); + return $s; } } |