Merge "parser: Validate $length in padleft/padright parser functions"

[lhc/web/wiklou.git] / includes / specials / SpecialPasswordReset.php

diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php
index a4f16bd..7342bb0 100644 (file)
--- a/includes/specials/SpecialPasswordReset.php
+++ b/includes/specials/SpecialPasswordReset.php
@@ -36,11 +36,6 @@ class SpecialPasswordReset extends FormSpecialPage {
        /** @var PasswordReset */
        private $passwordReset = null;
 
-       /**
-        * @var string[] Temporary storage for the passwords which have been sent out, keyed by username.
-        */
-       private $passwords = [];
-
        /**
         * @var Status
         */
@@ -110,6 +105,8 @@ class SpecialPasswordReset extends FormSpecialPage {
        public function alterForm( HTMLForm $form ) {
                $resetRoutes = $this->getConfig()->get( 'PasswordResetRoutes' );
 
+               $form->setSubmitDestructive();
+
                $form->addHiddenFields( $this->getRequest()->getValues( 'returnto', 'returntoquery' ) );
 
                $i = 0;
@@ -136,8 +133,8 @@ class SpecialPasswordReset extends FormSpecialPage {
         * @return Status
         */
        public function onSubmit( array $data ) {
-               $username = isset( $data['Username'] ) ? $data['Username'] : null;
-               $email = isset( $data['Email'] ) ? $data['Email'] : null;
+               $username = $data['Username'] ?? null;
+               $email = $data['Email'] ?? null;
 
                $this->method = $username ? 'username' : 'email';
                $this->result = Status::wrap(