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 "Declare dynamic properties"
[lhc/web/wiklou.git]
/
includes
/
specialpage
/
LoginSignupSpecialPage.php
diff --git
a/includes/specialpage/LoginSignupSpecialPage.php
b/includes/specialpage/LoginSignupSpecialPage.php
index
e5a28d9
..
94be852
100644
(file)
--- a/
includes/specialpage/LoginSignupSpecialPage.php
+++ b/
includes/specialpage/LoginSignupSpecialPage.php
@@
-975,7
+975,11
@@
abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
}
}
if ( !$this->isSignup() && $this->showExtraInformation() ) {
}
}
if ( !$this->isSignup() && $this->showExtraInformation() ) {
- $passwordReset = new PasswordReset( $this->getConfig(), AuthManager::singleton() );
+ $passwordReset = new PasswordReset(
+ $this->getConfig(),
+ AuthManager::singleton(),
+ MediaWikiServices::getInstance()->getPermissionManager()
+ );
if ( $passwordReset->isAllowed( $this->getUser() )->isGood() ) {
$fieldDefinitions['passwordReset'] = [
'type' => 'info',
if ( $passwordReset->isAllowed( $this->getUser() )->isGood() ) {
$fieldDefinitions['passwordReset'] = [
'type' => 'info',
@@
-1072,7
+1076,10
@@
abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
private function showCreateAccountLink() {
if ( $this->isSignup() ) {
return true;
private function showCreateAccountLink() {
if ( $this->isSignup() ) {
return true;
- } elseif ( $this->getUser()->isAllowed( 'createaccount' ) ) {
+ } elseif ( MediaWikiServices::getInstance()
+ ->getPermissionManager()
+ ->userHasRight( $this->getUser(), 'createaccount' )
+ ) {
return true;
} else {
return false;
return true;
} else {
return false;