diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-06-07 21:35:45 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-06-07 21:35:45 +0000 |
| commit | ae45b735d39d8391d27ab4facc491af2983ee669 (patch) | |
| tree | b33313bc45e4e7889347c2f5cca94f829b9b9e66 | |
| parent | f60135d2d63dc6dcc2067921b68bc88820365856 (diff) | |
| download | brdo-ae45b735d39d8391d27ab4facc491af2983ee669.tar.gz brdo-ae45b735d39d8391d27ab4facc491af2983ee669.tar.bz2 | |
- Bugfix: clicking the "Login" button after having created the first user
redirected you to an incorrect page. Patch by Moshe.
| -rw-r--r-- | modules/user.module | 1 | ||||
| -rw-r--r-- | modules/user/user.module | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/modules/user.module b/modules/user.module index e7935c7c3..435d00759 100644 --- a/modules/user.module +++ b/modules/user.module @@ -823,6 +823,7 @@ function user_register($edit = array()) { user_mail($edit["mail"], t("drupal user account details for %s", array("%s" => $edit["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". url("user/edit") ."\n\n--drupal"), $variables), "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from"); // This should not be t()'ed. No point as its only shown once in the sites lifetime, and it would be bad to store the password $output .= "<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 configure your e-mail settings using the Administration pages.</p><p> Your password is <b>$pass</b>. You may change your password on the next page.</p><p>Please login below.</p>"; + $output .= form_hidden("destination", url("user/edit")); $output .= form_hidden("name", $account->name); $output .= form_hidden("pass", $pass); $output .= form_submit(t("Log in")); diff --git a/modules/user/user.module b/modules/user/user.module index e7935c7c3..435d00759 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -823,6 +823,7 @@ function user_register($edit = array()) { user_mail($edit["mail"], t("drupal user account details for %s", array("%s" => $edit["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". url("user/edit") ."\n\n--drupal"), $variables), "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from"); // This should not be t()'ed. No point as its only shown once in the sites lifetime, and it would be bad to store the password $output .= "<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 configure your e-mail settings using the Administration pages.</p><p> Your password is <b>$pass</b>. You may change your password on the next page.</p><p>Please login below.</p>"; + $output .= form_hidden("destination", url("user/edit")); $output .= form_hidden("name", $account->name); $output .= form_hidden("pass", $pass); $output .= form_submit(t("Log in")); |