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 "Make Special:ChangeContentModel field labels consistently use colons"
[lhc/web/wiklou.git]
/
includes
/
actions
/
WatchAction.php
diff --git
a/includes/actions/WatchAction.php
b/includes/actions/WatchAction.php
index
0eba613
..
e88654a
100644
(file)
--- a/
includes/actions/WatchAction.php
+++ b/
includes/actions/WatchAction.php
@@
-20,6
+20,8
@@
* @ingroup Actions
*/
* @ingroup Actions
*/
+use MediaWiki\MediaWikiServices;
+
/**
* Page addition to a user's watchlist
*
/**
* Page addition to a user's watchlist
*
@@
-116,7
+118,8
@@
class WatchAction extends FormAction {
User $user,
$checkRights = User::CHECK_USER_RIGHTS
) {
User $user,
$checkRights = User::CHECK_USER_RIGHTS
) {
- if ( $checkRights && !$user->isAllowed( 'editmywatchlist' ) ) {
+ $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
+ if ( $checkRights && !$permissionManager->userHasRight( $user, 'editmywatchlist' ) ) {
return User::newFatalPermissionDeniedStatus( 'editmywatchlist' );
}
return User::newFatalPermissionDeniedStatus( 'editmywatchlist' );
}
@@
-140,7
+143,9
@@
class WatchAction extends FormAction {
* @return Status
*/
public static function doUnwatch( Title $title, User $user ) {
* @return Status
*/
public static function doUnwatch( Title $title, User $user ) {
- if ( !$user->isAllowed( 'editmywatchlist' ) ) {
+ if ( !MediaWikiServices::getInstance()
+ ->getPermissionManager()
+ ->userHasRight( $user, 'editmywatchlist' ) ) {
return User::newFatalPermissionDeniedStatus( 'editmywatchlist' );
}
return User::newFatalPermissionDeniedStatus( 'editmywatchlist' );
}