From ae45b735d39d8391d27ab4facc491af2983ee669 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 7 Jun 2003 21:35:45 +0000
Subject: [PATCH] - Bugfix: clicking the "Login" button after having created
 the first user   redirected you to an incorrect page.  Patch by Moshe.

---
 modules/user.module      | 1 +
 modules/user/user.module | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/user.module b/modules/user.module
index e7935c7c3147..435d00759fbc 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 e7935c7c3147..435d00759fbc 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"));
-- 
GitLab