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 "StringUtils: Add a utility for checking if a string is a valid regex"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialRecentChanges.php
diff --git
a/includes/specials/SpecialRecentChanges.php
b/includes/specials/SpecialRecentChanges.php
index
0bfe185
..
4683fe6
100644
(file)
--- a/
includes/specials/SpecialRecentChanges.php
+++ b/
includes/specials/SpecialRecentChanges.php
@@
-185,7
+185,9
@@
class SpecialRecentChanges extends ChangesListSpecialPage {
if (
!$this->including() &&
$this->getUser()->isLoggedIn() &&
if (
!$this->including() &&
$this->getUser()->isLoggedIn() &&
- $this->getUser()->isAllowed( 'viewmywatchlist' )
+ MediaWikiServices::getInstance()
+ ->getPermissionManager()
+ ->userHasRight( $this->getUser(), 'viewmywatchlist' )
) {
$this->registerFiltersFromDefinitions( [ $this->watchlistFilterGroupDefinition ] );
$watchlistGroup = $this->getFilterGroup( 'watchlist' );
) {
$this->registerFiltersFromDefinitions( [ $this->watchlistFilterGroupDefinition ] );
$watchlistGroup = $this->getFilterGroup( 'watchlist' );
@@
-279,7
+281,10
@@
class SpecialRecentChanges extends ChangesListSpecialPage {
$join_conds = array_merge( $join_conds, $rcQuery['joins'] );
// JOIN on watchlist for users
$join_conds = array_merge( $join_conds, $rcQuery['joins'] );
// JOIN on watchlist for users
- if ( $user->isLoggedIn() && $user->isAllowed( 'viewmywatchlist' ) ) {
+ if ( $user->isLoggedIn() && MediaWikiServices::getInstance()
+ ->getPermissionManager()
+ ->userHasRight( $user, 'viewmywatchlist' )
+ ) {
$tables[] = 'watchlist';
$fields[] = 'wl_user';
$fields[] = 'wl_notificationtimestamp';
$tables[] = 'watchlist';
$fields[] = 'wl_user';
$fields[] = 'wl_notificationtimestamp';