(bug 2400) don't send confirmation mail on account creation if $wgEmailAuthentication...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 87fd032..f504ed0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -282,6 +282,8 @@ Various bugfixes, small features, and a few experimental things:
 * (bug 2394) Undo incompatible breakage to {{msg:}} compatiblity includes
 * (bug 1322) Use a shorter cl_sortkey field to avoid breaking on MySQL 4.1
   when the default charset is set to utf8
+* (bug 2400) don't send confirmation mail on account creation if 
+  $wgEmailAuthentication is false.
 
 
 === Caveats ===

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 5bfa706..99d4074 100644 (file)
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -131,7 +131,7 @@ class LoginForm {
         * @access private
         */
        function addNewAccount() {
-               global $wgUser, $wgOut;
+               global $wgUser, $wgOut, $wgEmailAuthentication;
 
                $u = $this->addNewAccountInternal();
 
@@ -143,7 +143,7 @@ class LoginForm {
                $wgUser->setCookies();
 
                $wgUser->saveSettings();
-               if( $wgUser->isValidEmailAddr( $wgUser->getEmail() ) ) {
+               if( $ wgEmailAuthentication && $wgUser->isValidEmailAddr( $wgUser->getEmail() ) ) {
                        $wgUser->sendConfirmationMail();
                }