X-Git-Url: http://git.cyclocoop.org//%27http:/jquery.khurshid.com/ifixpng.php/%27?a=blobdiff_plain;f=includes%2FMergeHistory.php;h=4045a5436b56127550ec76709fe8dc9207e3ffa4;hb=c1ec8b95ab218e0b62d5e7a71855dff241b53f15;hp=6bd4471723d32d843dcc6d51a0e52e94f081255a;hpb=98a2f24354f295e19b1f02f5d086f75b79e4e115;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MergeHistory.php b/includes/MergeHistory.php
index 6bd4471723..4045a5436b 100644
--- a/includes/MergeHistory.php
+++ b/includes/MergeHistory.php
@@ -178,7 +178,8 @@ class MergeHistory {
 		}
 
 		// 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' );
 		}