dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Drop strings for wgExternalDiffEngine, deprecated in 1.27 and 1.32" into REL1_34
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialPasswordReset.php
diff --git
a/includes/specials/SpecialPasswordReset.php
b/includes/specials/SpecialPasswordReset.php
index
7ea9ba0
..
c1d30ee
100644
(file)
--- a/
includes/specials/SpecialPasswordReset.php
+++ b/
includes/specials/SpecialPasswordReset.php
@@
-21,7
+21,7
@@
* @ingroup SpecialPage
*/
* @ingroup SpecialPage
*/
-use MediaWiki\
Auth\AuthManager
;
+use MediaWiki\
MediaWikiServices
;
/**
* Special page for requesting a password reset email.
/**
* Special page for requesting a password reset email.
@@
-52,7
+52,7
@@
class SpecialPasswordReset extends FormSpecialPage {
private function getPasswordReset() {
if ( $this->passwordReset === null ) {
private function getPasswordReset() {
if ( $this->passwordReset === null ) {
- $this->passwordReset =
new PasswordReset( $this->getConfig(), AuthManager::singleton()
);
+ $this->passwordReset =
MediaWikiServices::getInstance()->getPasswordReset(
);
}
return $this->passwordReset;
}
}
return $this->passwordReset;
}
@@
-79,7
+79,8
@@
class SpecialPasswordReset extends FormSpecialPage {
$a = [];
if ( isset( $resetRoutes['username'] ) && $resetRoutes['username'] ) {
$a['Username'] = [
$a = [];
if ( isset( $resetRoutes['username'] ) && $resetRoutes['username'] ) {
$a['Username'] = [
- 'type' => 'user',
+ 'type' => 'text',
+ 'default' => $this->getRequest()->getSession()->suggestLoginUsername(),
'label-message' => 'passwordreset-username',
];
'label-message' => 'passwordreset-username',
];