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 "localisation: Release data from memory in LCStoreStaticArray::finishWrite"
[lhc/web/wiklou.git]
/
includes
/
MergeHistory.php
diff --git
a/includes/MergeHistory.php
b/includes/MergeHistory.php
index
6bd4471
..
4045a54
100644
(file)
--- a/
includes/MergeHistory.php
+++ b/
includes/MergeHistory.php
@@
-178,7
+178,8
@@
class MergeHistory {
}
// Check mergehistory permission
}
// Check mergehistory permission
- if ( !$user->isAllowed( 'mergehistory' ) ) {
+ $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
+ if ( !$permissionManager->userHasRight( $user, 'mergehistory' ) ) {
// User doesn't have the right to merge histories
$status->fatal( 'mergehistory-fail-permission' );
}
// User doesn't have the right to merge histories
$status->fatal( 'mergehistory-fail-permission' );
}