Renamed PasswordReset class to SpecialResetpass and fixed an entry in SpecialUserlogi...

This also caused a regression with PasswordReset extension (renaming PasswordResetForm to PasswordReset) since this extension also have a PasswordReset class

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 345e5fe..90e9a53 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -469,7 +469,7 @@ $wgAutoloadLocalClasses = array(
        'SpecialContributions' => 'includes/specials/SpecialContributions.php',
        'NewPagesPager' => 'includes/specials/SpecialNewpages.php',
        'PageArchive' => 'includes/specials/SpecialUndelete.php',
-       'PasswordReset' => 'includes/specials/SpecialResetpass.php',
+       'SpecialResetpass' => 'includes/specials/SpecialResetpass.php',
        'PopularPagesPage' => 'includes/specials/SpecialPopularpages.php',
        'PreferencesForm' => 'includes/specials/SpecialPreferences.php',
        'RandomPage' => 'includes/specials/SpecialRandompage.php',

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index bcfc944..def5aaa 100644 (file)
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -89,7 +89,7 @@ class SpecialPage
                'CreateAccount'             => array( 'SpecialRedirectToSpecial', 'CreateAccount', 'Userlogin', 'signup', array( 'uselang' ) ),
                'Preferences'               => array( 'SpecialPage', 'Preferences' ),
                'Watchlist'                 => array( 'SpecialPage', 'Watchlist' ),
-               'Resetpass'                 => 'PasswordReset',
+               'Resetpass'                 => 'SpecialResetpass',
 
 
                'Recentchanges'             => 'SpecialRecentchanges',

diff --git a/includes/specials/SpecialResetpass.php b/includes/specials/SpecialResetpass.php
index 0576968..e1dc21c 100644 (file)
--- a/includes/specials/SpecialResetpass.php
+++ b/includes/specials/SpecialResetpass.php
@@ -8,7 +8,7 @@
  * Let users recover their password.
  * @ingroup SpecialPage
  */
-class PasswordReset extends SpecialPage {
+class SpecialResetpass extends SpecialPage {
        public function __construct() {
                parent::__construct( 'Resetpass' );
        }

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 06e481a..75b065d 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -583,7 +583,7 @@ class LoginForm {
        function resetLoginForm( $error ) {
                global $wgOut;
                $wgOut->addHTML( Xml::element('p', array( 'class' => 'error' ), $error ) );
-               $reset = new PasswordResetForm( $this->mName, $this->mPassword );
+               $reset = new SpecialResetpass();
                $reset->execute( null );
        }