diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-04-29 08:04:24 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-04-29 08:04:24 +0000 |
| commit | 94c3dceedae0123f7a1bd518d00aa2839ca82d14 (patch) | |
| tree | 807ea8505fec1bce86ef7f4bc584e46e917ca456 /modules/user | |
| parent | 1ed25923a356008fd0148de5d41ee3623d4c8f3e (diff) | |
| download | brdo-94c3dceedae0123f7a1bd518d00aa2839ca82d14.tar.gz brdo-94c3dceedae0123f7a1bd518d00aa2839ca82d14.tar.bz2 | |
- Patch #240873 by Gábor Hojtsy: move custom help settings to blocks. Very exciting.
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/user.admin.inc | 1 | ||||
| -rw-r--r-- | modules/user/user.module | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc index eb5e621f9..dd7430bb5 100644 --- a/modules/user/user.admin.inc +++ b/modules/user/user.admin.inc @@ -242,7 +242,6 @@ function user_admin_settings() { $form['registration'] = array('#type' => 'fieldset', '#title' => t('User registration settings')); $form['registration']['user_register'] = array('#type' => 'radios', '#title' => t('Public registrations'), '#default_value' => variable_get('user_register', 1), '#options' => array(t('Only site administrators can create new user accounts.'), t('Visitors can create accounts and no administrator approval is required.'), t('Visitors can create accounts but administrator approval is required.'))); $form['registration']['user_email_verification'] = array('#type' => 'checkbox', '#title' => t('Require e-mail verification when a visitor creates an account'), '#default_value' => variable_get('user_email_verification', TRUE), '#description' => t('If this box is checked, new users will be required to validate their e-mail address prior to logging into the site, and will be assigned a system-generated password. With it unchecked, users will be logged in immediately upon registering, and may select their own passwords during registration.')); - $form['registration']['user_registration_help'] = array('#type' => 'textarea', '#title' => t('User registration guidelines'), '#default_value' => variable_get('user_registration_help', ''), '#description' => t('This text is displayed at the top of the user registration form and is useful for helping or instructing your users.')); // Account cancellation settings. module_load_include('inc', 'user', 'user.pages'); diff --git a/modules/user/user.module b/modules/user/user.module index dc4e95343..c4193c7a3 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -2850,11 +2850,6 @@ function user_register() { $form = array(); - // Display the registration form. - if (!$admin) { - $form['user_registration_help'] = array('#markup' => filter_xss_admin(variable_get('user_registration_help', ''))); - } - // Merge in the default user edit fields. $form = array_merge($form, user_edit_form($form_state, NULL, NULL, TRUE)); if ($admin) { |