* Don't list sp:ChangeEmail/sp:ChangePassword at SpecialPages. These were clutter...

* Added check for checkTemporaryPassword() to sp:ChangeEmail.

diff --git a/includes/specials/SpecialChangeEmail.php b/includes/specials/SpecialChangeEmail.php
index 13f490b..4298c33 100644 (file)
--- 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 6d7f558..f87aa0e 100644 (file)
--- 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' );
        }