From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 9 Sep 2011 09:25:33 +0000 (+0000)
Subject: * Don't list sp:ChangeEmail/sp:ChangePassword at SpecialPages. These were clutter... 
X-Git-Tag: 1.31.0-rc.0~27769
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=8148f72d4cfebb1cdef2783dc96220cf7bdbc0ae;p=lhc%2Fweb%2Fwiklou.git

* Don't list sp:ChangeEmail/sp:ChangePassword at SpecialPages. These were clutter, and useless for anons, as there are links on sp:Preferences for these.
* Added check for checkTemporaryPassword() to sp:ChangeEmail.
---

diff --git a/includes/specials/SpecialChangeEmail.php b/includes/specials/SpecialChangeEmail.php
index 13f490bde3..4298c33359 100644
--- a/includes/specials/SpecialChangeEmail.php
+++ b/includes/specials/SpecialChangeEmail.php
@@ -26,7 +26,7 @@
  *
  * @ingroup SpecialPage
  */
-class SpecialChangeEmail extends SpecialPage {
+class SpecialChangeEmail extends UnlistedSpecialPage {
 	public function __construct() {
 		parent::__construct( 'ChangeEmail' );
 	}
@@ -180,7 +180,7 @@ class SpecialChangeEmail extends SpecialPage {
 			return false;
 		}
 
-		if ( !$user->checkPassword( $pass ) ) {
+		if ( !$user->checkTemporaryPassword( $pass ) && !$user->checkPassword( $pass ) ) {
 			$this->error( wfMsgHtml( 'wrongpassword' ) );
 			return false;
 		}
diff --git a/includes/specials/SpecialChangePassword.php b/includes/specials/SpecialChangePassword.php
index 6d7f55803f..f87aa0e8da 100644
--- a/includes/specials/SpecialChangePassword.php
+++ b/includes/specials/SpecialChangePassword.php
@@ -26,7 +26,7 @@
  *
  * @ingroup SpecialPage
  */
-class SpecialChangePassword extends SpecialPage {
+class SpecialChangePassword extends UnlistedSpecialPage {
 	public function __construct() {
 		parent::__construct( 'ChangePassword' );
 	}