* (bug 3974) Add parameter for site URL to "passwordremindertext"

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 473bedb..8f8a932 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -306,6 +306,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 2015) Add "\sim" to ~ conversion for HTML rendering
 * (bug 6029) Improvement to German localisation (de)
 * (bug 5015) Update be: magic words
+* (bug 3974) Add parameter for site URL to "passwordremindertext"
 
 == Compatibility ==
 

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 748ba33..03a4185 100644 (file)
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -403,6 +403,7 @@ class LoginForm {
         */
        function mailPasswordInternal( $u ) {
                global $wgCookiePath, $wgCookieDomain, $wgCookiePrefix, $wgCookieSecure;
+               global $wgServer, $wgScript;
 
                if ( '' == $u->getEmail() ) {
                        return wfMsg( 'noemail', $u->getName() );
@@ -418,7 +419,7 @@ class LoginForm {
                $ip = wfGetIP();
                if ( '' == $ip ) { $ip = '(Unknown)'; }
 
-               $m = wfMsg( 'passwordremindertext', $ip, $u->getName(), $np );
+               $m = wfMsg( 'passwordremindertext', $ip, $u->getName(), $np, $wgServer . $wgScript );
 
                $result = $u->sendMail( wfMsg( 'passwordremindertitle' ), $m );
                return $result;

diff --git a/languages/Messages.php b/languages/Messages.php
index 57234bd..9e27c40 100644 (file)
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -401,7 +401,7 @@ Your account has been created. Don't forget to change your {{SITENAME}} preferen
 'mailmypassword'       => 'E-mail password',
 'passwordremindertitle' => 'Password reminder from {{SITENAME}}',
 'passwordremindertext' => 'Someone (probably you, from IP address $1)
-requested that we send you a new {{SITENAME}} login password for {{SERVERNAME}}.
+requested that we send you a new password for {{SITENAME}} ($4).
 The password for user "$2" is now "$3".
 You should log in and change your password now.