diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-17 20:03:34 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-17 20:03:34 -0400 |
| commit | 939c8d3c8d3dce18e136d9ddff5fb93f064c61c3 (patch) | |
| tree | 2dafebccd7de10089eef3dd1356a5760a280b590 /include/template_processor.php | |
| parent | c7759af8c5375d3201b8185b61b6fc6feef98df0 (diff) | |
| parent | 26258bca77aa3385dacf36874f7f5603eaef9a6b (diff) | |
| download | volse-hubzilla-939c8d3c8d3dce18e136d9ddff5fb93f064c61c3.tar.gz volse-hubzilla-939c8d3c8d3dce18e136d9ddff5fb93f064c61c3.tar.bz2 volse-hubzilla-939c8d3c8d3dce18e136d9ddff5fb93f064c61c3.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
compare ssl_policy precisely in case somebody was bitten by template processor bug
template processor broken with foreach k=>v and k is integer 0
* master:
Diffstat (limited to 'include/template_processor.php')
| -rwxr-xr-x | include/template_processor.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/template_processor.php b/include/template_processor.php index 7f7b0b55b..93bf391c5 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(); } |