diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-03-28 19:52:30 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-03-28 19:52:30 +0200 |
| commit | bdd275474044152a5d9a33ea6b8a8071b931d27e (patch) | |
| tree | b10c2b68e0236925992449786d70f45aaca21984 /include/template_processor.php | |
| parent | 792edfe9c834e3daeae598727e4cb15dc0ff8475 (diff) | |
| parent | e894775a39920edc0e438364c818357ab809bace (diff) | |
| download | volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.tar.gz volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.tar.bz2 volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.zip | |
Merge commit '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; } } |