X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2Fpagers%2FImageListPager.php;h=36909aa08662d7e23e4422a58378914ee46c32fb;hb=874cf5f355f11148a99846a5cf7feee52d99cdb4;hp=486b0ec91074a55be304db619c79230345e0a4e1;hpb=9fc202b69496353a1142a692be5aaf158e9ea30c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/pagers/ImageListPager.php b/includes/specials/pagers/ImageListPager.php
index 486b0ec910..36909aa086 100644
--- a/includes/specials/pagers/ImageListPager.php
+++ b/includes/specials/pagers/ImageListPager.php
@@ -269,10 +269,8 @@ class ImageListPager extends TablePager {
 				}
 			}
 			$fields['top'] = $dbr->addQuotes( 'no' );
-		} else {
-			if ( $this->mShowAll ) {
-				$fields['top'] = $dbr->addQuotes( 'yes' );
-			}
+		} elseif ( $this->mShowAll ) {
+			$fields['top'] = $dbr->addQuotes( 'yes' );
 		}
 		$fields['thumb'] = $prefix . '_name';
 
@@ -382,14 +380,12 @@ class ImageListPager extends TablePager {
 					$resultArray[] = $topRes2;
 					$topRes2 = $res2->next();
 				}
+			} elseif ( !$ascending ) {
+				$resultArray[] = $topRes2;
+				$topRes2 = $res2->next();
 			} else {
-				if ( !$ascending ) {
-					$resultArray[] = $topRes2;
-					$topRes2 = $res2->next();
-				} else {
-					$resultArray[] = $topRes1;
-					$topRes1 = $res1->next();
-				}
+				$resultArray[] = $topRes1;
+				$topRes1 = $res1->next();
 			}
 		}
 
@@ -440,7 +436,8 @@ class ImageListPager extends TablePager {
 	 * @throws MWException
 	 */
 	function formatValue( $field, $value ) {
-		$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+		$services = MediaWikiServices::getInstance();
+		$linkRenderer = $services->getLinkRenderer();
 		switch ( $field ) {
 			case 'thumb':
 				$opt = [ 'time' => wfTimestamp( TS_MW, $this->mCurrentRow->img_timestamp ) ];
@@ -472,15 +469,18 @@ class ImageListPager extends TablePager {
 						$filePage,
 						$filePage->getText()
 					);
-					$download = Xml::element( 'a',
-						[ 'href' => wfLocalFile( $filePage )->getUrl() ],
+					$download = Xml::element(
+						'a',
+						[ 'href' => $services->getRepoGroup()->findFile( $filePage )->getUrl() ],
 						$imgfile
 					);
 					$download = $this->msg( 'parentheses' )->rawParams( $download )->escaped();
 
 					// Add delete links if allowed
 					// From https://github.com/Wikia/app/pull/3859
-					if ( $filePage->userCan( 'delete', $this->getUser() ) ) {
+					$permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
+
+					if ( $permissionManager->userCan( 'delete', $this->getUser(), $filePage ) ) {
 						$deleteMsg = $this->msg( 'listfiles-delete' )->text();
 
 						$delete = $linkRenderer->makeKnownLink(
@@ -517,7 +517,7 @@ class ImageListPager extends TablePager {
 				return $this->getLanguage()->formatNum( intval( $value ) + 1 );
 			case 'top':
 				// Messages: listfiles-latestversion-yes, listfiles-latestversion-no
-				return $this->msg( 'listfiles-latestversion-' . $value );
+				return $this->msg( 'listfiles-latestversion-' . $value )->escaped();
 			default:
 				throw new MWException( "Unknown field '$field'" );
 		}