X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Fpage%2FImageHistoryList.php;h=cf2497f94e49bea464861778d82b55e629895c30;hb=7d54426c3794aa601f250cd314060a39725bd8b0;hp=dc755410e11549f079271b8a9a6a87ad720fbc47;hpb=5264862bc1224fbb2eec487155aa0253af1fa777;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/page/ImageHistoryList.php b/includes/page/ImageHistoryList.php index dc755410e1..cf2497f94e 100644 --- a/includes/page/ImageHistoryList.php +++ b/includes/page/ImageHistoryList.php @@ -120,6 +120,7 @@ class ImageHistoryList extends ContextSource { $lang = $this->getLanguage(); $pm = MediaWikiServices::getInstance()->getPermissionManager(); $timestamp = wfTimestamp( TS_MW, $file->getTimestamp() ); + // @phan-suppress-next-line PhanUndeclaredMethod $img = $iscur ? $file->getName() : $file->getArchiveName(); $userId = $file->getUser( 'id' ); $userText = $file->getUser( 'text' ); @@ -129,11 +130,10 @@ class ImageHistoryList extends ContextSource { $row = $selected = ''; // Deletion link - if ( $local && ( $pm->userHasAnyRight( $user, 'delete', 'deletedhistory' ) ) - ) { + if ( $local && ( $pm->userHasAnyRight( $user, 'delete', 'deletedhistory' ) ) ) { $row .= ''; # Link to remove from history - if ( $user->isAllowed( 'delete' ) ) { + if ( $pm->userHasRight( $user, 'delete' ) ) { $q = [ 'action' => 'delete' ]; if ( !$iscur ) { $q['oldimage'] = $img; @@ -145,9 +145,10 @@ class ImageHistoryList extends ContextSource { ); } # Link to hide content. Don't show useless link to people who cannot hide revisions. - $canHide = $user->isAllowed( 'deleterevision' ); - if ( $canHide || ( $user->isAllowed( 'deletedhistory' ) && $file->getVisibility() ) ) { - if ( $user->isAllowed( 'delete' ) ) { + $canHide = $pm->userHasRight( $user, 'deleterevision' ); + if ( $canHide || ( $pm->userHasRight( $user, 'deletedhistory' ) + && $file->getVisibility() ) ) { + if ( $pm->userHasRight( $user, 'delete' ) ) { $row .= '
'; } // If file is top revision or locked from this user, don't link