diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-21 21:23:40 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-21 21:23:40 -0400 |
commit | 867e3b33d11a8403ce2d7eda567b8eb7ba58bda7 (patch) | |
tree | 1a91309205c5659516b0a7daab0d478db82b846a /mod/admin.php | |
parent | f570965ebe65fe7d549cafea5f5d8c04da3d986f (diff) | |
parent | 9ca3ac6e61ff57a2bc615b133a64b0a7f66b3c41 (diff) | |
download | volse-hubzilla-867e3b33d11a8403ce2d7eda567b8eb7ba58bda7.tar.gz volse-hubzilla-867e3b33d11a8403ce2d7eda567b8eb7ba58bda7.tar.bz2 volse-hubzilla-867e3b33d11a8403ce2d7eda567b8eb7ba58bda7.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
rev update, bug 428, 429, and ability to block globaldir submissions from demo sites
* master:
Diffstat (limited to 'mod/admin.php')
-rw-r--r-- | mod/admin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/admin.php b/mod/admin.php index 2810c8a8a..1f53f112d 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -417,7 +417,7 @@ function admin_page_site(&$a) { '$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), - '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), t("Will be displayed prominently on the registration page.")), + '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")), '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')), '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")), '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), |