diff options
| author | friendica <info@friendica.com> | 2012-03-17 02:26:52 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-03-17 02:26:52 -0700 |
| commit | e0e008fb8d894c7fe56fbb88fa96224c0796ea75 (patch) | |
| tree | 79379bbf719c3a24e66ee57b04a52071fea115bd | |
| parent | 057a142b8cd01cd8ab6212e9d958989c82dfccc3 (diff) | |
| download | volse-hubzilla-e0e008fb8d894c7fe56fbb88fa96224c0796ea75.tar.gz volse-hubzilla-e0e008fb8d894c7fe56fbb88fa96224c0796ea75.tar.bz2 volse-hubzilla-e0e008fb8d894c7fe56fbb88fa96224c0796ea75.zip | |
template processor broken with foreach k=>v and k is integer 0
| -rwxr-xr-x | include/template_processor.php | 2 | ||||
| -rwxr-xr-x | mod/admin.php | 4 |
2 files changed, 3 insertions, 3 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(); } diff --git a/mod/admin.php b/mod/admin.php index 88ccad6d3..a64b26903 100755 --- a/mod/admin.php +++ b/mod/admin.php @@ -308,7 +308,7 @@ function admin_page_site(&$a) { SSL_POLICY_FULL => t("Force all links to use SSL"), SSL_POLICY_SELFSIGN => t("Self-signed certificate, use SSL for local links only (discouraged)") ); - + $t = get_markup_template("admin_site.tpl"); return replace_macros($t, array( '$title' => t('Administration'), @@ -325,7 +325,7 @@ function admin_page_site(&$a) { '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles"), $theme_choices), - '$ssl_policy' => array('ssl_policy', t("SSL link policy"), get_config('system','ssl_policy'), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), + '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), '$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices), |