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 /mod/admin.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 'mod/admin.php')
| -rwxr-xr-x | mod/admin.php | 4 |
1 files changed, 2 insertions, 2 deletions
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), |