diff options
| author | zottel <github@zottel.net> | 2012-03-18 01:02:30 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-18 01:02:30 +0100 |
| commit | df78c9be0bab909dfa8cf196f7aaa4ea3423be8c (patch) | |
| tree | 2dafebccd7de10089eef3dd1356a5760a280b590 /mod/admin.php | |
| parent | 3bbd82abb3b33f041ec35b85de5bddcd79ed5471 (diff) | |
| parent | 26258bca77aa3385dacf36874f7f5603eaef9a6b (diff) | |
| download | volse-hubzilla-df78c9be0bab909dfa8cf196f7aaa4ea3423be8c.tar.gz volse-hubzilla-df78c9be0bab909dfa8cf196f7aaa4ea3423be8c.tar.bz2 volse-hubzilla-df78c9be0bab909dfa8cf196f7aaa4ea3423be8c.zip | |
Merge remote branch 'upstream/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), |