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 "Deprecate the GetBlockedStatus hook"
[lhc/web/wiklou.git]
/
includes
/
user
/
PasswordReset.php
diff --git
a/includes/user/PasswordReset.php
b/includes/user/PasswordReset.php
index
aada319
..
fd8eb3f
100644
(file)
--- a/
includes/user/PasswordReset.php
+++ b/
includes/user/PasswordReset.php
@@
-70,8
+70,6
@@
class PasswordReset implements LoggerAwareInterface {
/**
* Check if a given user has permission to use this functionality.
* @param User $user
/**
* Check if a given user has permission to use this functionality.
* @param User $user
- * @param bool $displayPassword If set, also check whether the user is allowed to reset the
- * password of another user and see the temporary password.
* @since 1.29 Second argument for displayPassword removed.
* @return StatusValue
*/
* @since 1.29 Second argument for displayPassword removed.
* @return StatusValue
*/