diff options
| author | zottel <github@zottel.net> | 2012-05-22 08:46:02 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-22 08:46:02 +0200 |
| commit | e9c86c0fd0fb87b49e60669e6d4be810ca426ec4 (patch) | |
| tree | cfee80cc9122974a4304591aa7d54ca5fc8a71ea /mod/admin.php | |
| parent | 2cd3ec7b983327f8c162845d0f4b8d9753f30e27 (diff) | |
| parent | 02502c3a7460a1af3414b65232fd7c672a76d941 (diff) | |
| download | volse-hubzilla-e9c86c0fd0fb87b49e60669e6d4be810ca426ec4.tar.gz volse-hubzilla-e9c86c0fd0fb87b49e60669e6d4be810ca426ec4.tar.bz2 volse-hubzilla-e9c86c0fd0fb87b49e60669e6d4be810ca426ec4.zip | |
Merge remote branch 'upstream/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")), |