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 "resourceloader: Add $context to static functions in ResourceLoader"
[lhc/web/wiklou.git]
/
includes
/
logging
/
MergeLogFormatter.php
diff --git
a/includes/logging/MergeLogFormatter.php
b/includes/logging/MergeLogFormatter.php
index
7a6fb9d
..
925c976
100644
(file)
--- a/
includes/logging/MergeLogFormatter.php
+++ b/
includes/logging/MergeLogFormatter.php
@@
-22,6
+22,8
@@
* @since 1.25
*/
* @since 1.25
*/
+use MediaWiki\MediaWikiServices;
+
/**
* This class formats merge log entries.
*
/**
* This class formats merge log entries.
*
@@
-47,7
+49,9
@@
class MergeLogFormatter extends LogFormatter {
public function getActionLinks() {
if ( $this->entry->isDeleted( LogPage::DELETED_ACTION ) // Action is hidden
public function getActionLinks() {
if ( $this->entry->isDeleted( LogPage::DELETED_ACTION ) // Action is hidden
- || !$this->context->getUser()->isAllowed( 'mergehistory' )
+ || !MediaWikiServices::getInstance()
+ ->getPermissionManager()
+ ->userHasRight( $this->context->getUser(), 'mergehistory' )
) {
return '';
}
) {
return '';
}