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 "output: Narrow Title type hint to LinkTarget"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialWatchlist.php
diff --git
a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index
2443470
..
84b3331
100644
(file)
--- a/
includes/specials/SpecialWatchlist.php
+++ b/
includes/specials/SpecialWatchlist.php
@@
-148,6
+148,7
@@
class SpecialWatchlist extends ChangesListSpecialPage {
/**
* @inheritDoc
/**
* @inheritDoc
+ * @suppress PhanUndeclaredMethod
*/
protected function registerFilters() {
parent::registerFilters();
*/
protected function registerFilters() {
parent::registerFilters();
@@
-380,9
+381,10
@@
class SpecialWatchlist extends ChangesListSpecialPage {
// Log entries with DELETED_ACTION must not show up unless the user has
// the necessary rights.
// Log entries with DELETED_ACTION must not show up unless the user has
// the necessary rights.
- if ( !$user->isAllowed( 'deletedhistory' ) ) {
+ $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
+ if ( !$permissionManager->userHasRight( $user, 'deletedhistory' ) ) {
$bitmask = LogPage::DELETED_ACTION;
$bitmask = LogPage::DELETED_ACTION;
- } elseif ( !$
user->isAllowedAny(
'suppressrevision', 'viewsuppressed' ) ) {
+ } elseif ( !$
permissionManager->userHasAnyRight( $user,
'suppressrevision', 'viewsuppressed' ) ) {
$bitmask = LogPage::DELETED_ACTION | LogPage::DELETED_RESTRICTED;
} else {
$bitmask = 0;
$bitmask = LogPage::DELETED_ACTION | LogPage::DELETED_RESTRICTED;
} else {
$bitmask = 0;