summaryrefslogtreecommitdiff
path: root/modules/user/user.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2007-05-10 19:55:24 +0000
committerDries Buytaert <dries@buytaert.net>2007-05-10 19:55:24 +0000
commit258c653f56ce7dd7dddcbe7c3a46c678dcb79b36 (patch)
treea30e00872d523d70b1b1ff901b7d7717cc9f3937 /modules/user/user.module
parent571013af8cac7f8c47bb8028495be2e0393d5150 (diff)
downloadbrdo-258c653f56ce7dd7dddcbe7c3a46c678dcb79b36.tar.gz
brdo-258c653f56ce7dd7dddcbe7c3a46c678dcb79b36.tar.bz2
- Patch #141637 by merlinofchaos, gabor, et al: provide a site config form at the end of install to collect data, plus allow profiles to modify and add more.
Diffstat (limited to 'modules/user/user.module')
-rw-r--r--modules/user/user.module6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index d4ddc76e7..ff3ee7b33 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1374,8 +1374,10 @@ function user_register_submit($form_id, $form_values) {
// The first user may login immediately, and receives a customized welcome e-mail.
if ($account->uid == 1) {
- drupal_mail('user-register-admin', $mail, t('Drupal user account details for !s', array('!s' => $name)), strtr(t("!username,\n\nYou may now login to !uri using the following username and password:\n\n username: !username\n password: !password\n\n!edit_uri\n\n--drupal"), $variables), $from);
- drupal_set_message(t('<p>Welcome to Drupal. You are user #1, which gives you full and immediate access. All future registrants will receive their passwords via e-mail, so please make sure your website e-mail address is set properly under the general settings on the <a href="@settings">site information settings page</a>.</p><p> Your password is <strong>%pass</strong>. You may change your password below.</p>', array('%pass' => $pass, '@settings' => url('admin/settings/site-information'))));
+ drupal_set_message(t('<p>Welcome to Drupal. You are now logged in as user #1, which gives you full control over your website.</p>'));
+ if (variable_get('user_email_verification', TRUE)) {
+ drupal_set_message(t('</p><p> Your password is <strong>%pass</strong>. You may change your password below.</p>', array('%pass' => $pass)));
+ }
user_authenticate($account->name, trim($pass));
return 'user/1/edit';