From ea4c7770de63b2a69d73d963cf0d5acb23698385 Mon Sep 17 00:00:00 2001 From: Jens Frank Date: Mon, 13 Jun 2005 18:19:18 +0000 Subject: [PATCH] (bug 2400) don't send confirmation mail on account creation if $wgEmailAuthentication is false.' --- RELEASE-NOTES | 2 ++ includes/SpecialUserlogin.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 87fd03204f..f504ed0418 100644 --- 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 5bfa70601f..99d40746ea 100644 --- 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(); } -- 2.20.1