From: Gergő Tisza <gtisza@wikimedia.org>
Date: Sat, 8 Dec 2018 08:32:17 +0000 (-0800)
Subject: Use username from last successful login in Special:PasswordReset
X-Git-Tag: 1.34.0-rc.0~3253^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=36feb5407dd127da4367473b3303604abd620668;p=lhc%2Fweb%2Fwiklou.git

Use username from last successful login in Special:PasswordReset

Alternative to I4ae492230.

Bug: T209972
Change-Id: I248092b14e86fa4ad389908eba462a8aaba6384a
---

diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php
index 7ea9ba019c..3524d79e65 100644
--- a/includes/specials/SpecialPasswordReset.php
+++ b/includes/specials/SpecialPasswordReset.php
@@ -79,7 +79,8 @@ class SpecialPasswordReset extends FormSpecialPage {
 		$a = [];
 		if ( isset( $resetRoutes['username'] ) && $resetRoutes['username'] ) {
 			$a['Username'] = [
-				'type' => 'user',
+				'type' => 'text',
+				'default' => $this->getRequest()->getSession()->suggestLoginUsername(),
 				'label-message' => 'passwordreset-username',
 			];