Don't use $wgServer (potentially protocol-relative!) in the password reset e-mail...
authorRoan Kattouw <catrope@users.mediawiki.org>
Mon, 5 Sep 2011 19:29:20 +0000 (19:29 +0000)
committerRoan Kattouw <catrope@users.mediawiki.org>
Mon, 5 Sep 2011 19:29:20 +0000 (19:29 +0000)
includes/specials/SpecialPasswordReset.php

index 476ab05..5cdb1c0 100644 (file)
@@ -152,7 +152,7 @@ class SpecialPasswordReset extends FormSpecialPage {
                        }
                }
 
-               global $wgServer, $wgScript, $wgNewPasswordExpiry;
+               global $wgNewPasswordExpiry;
 
                // All the users will have the same email address
                if ( $firstUser->getEmail() == '' ) {
@@ -190,7 +190,7 @@ class SpecialPasswordReset extends FormSpecialPage {
                        $username,
                        $passwordBlock,
                        count( $passwords ),
-                       $wgServer . $wgScript,
+                       Title::newMainPage()->getCanonicalUrl(),
                        round( $wgNewPasswordExpiry / 86400 )
                );