X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2Fpagers%2FCategoryPager.php;h=b78fed89d5701c884de30af76d37c382516bbbb7;hb=f9e3c2d046babc7309077816b0fe9961880f4e96;hp=fd2ac1f75f6803a1aa82d22650c4fa0096411aae;hpb=cd69b253b13c66eb5f61c27200f22ee7eac4cde0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/pagers/CategoryPager.php b/includes/specials/pagers/CategoryPager.php
index fd2ac1f75f..b78fed89d5 100644
--- a/includes/specials/pagers/CategoryPager.php
+++ b/includes/specials/pagers/CategoryPager.php
@@ -18,26 +18,24 @@
  * @file
  * @ingroup Pager
  */
+use MediaWiki\Linker\LinkRenderer;
 
 /**
- * TODO: Allow sorting by count.  We need to have a unique index to do this
- * properly.
- *
  * @ingroup Pager
  */
 class CategoryPager extends AlphabeticPager {
 
 	/**
-	 * @var PageLinkRenderer
+	 * @var LinkRenderer
 	 */
 	protected $linkRenderer;
 
 	/**
 	 * @param IContextSource $context
 	 * @param string $from
-	 * @param PageLinkRenderer $linkRenderer
+	 * @param LinkRenderer $linkRenderer
 	 */
-	public function __construct( IContextSource $context, $from, PageLinkRenderer $linkRenderer
+	public function __construct( IContextSource $context, $from, LinkRenderer $linkRenderer
 	) {
 		parent::__construct( $context );
 		$from = str_replace( ' ', '_', $from );
@@ -60,7 +58,6 @@ class CategoryPager extends AlphabeticPager {
 	}
 
 	function getIndexField() {
-# 		return array( 'abc' => 'cat_title', 'count' => 'cat_pages' );
 		return 'cat_title';
 	}
 
@@ -71,16 +68,6 @@ class CategoryPager extends AlphabeticPager {
 		return $this->mDefaultQuery;
 	}
 
-# 	protected function getOrderTypeMessages() {
-# 		return array( 'abc' => 'special-categories-sort-abc',
-# 			'count' => 'special-categories-sort-count' );
-# 	}
-
-	protected function getDefaultDirections() {
-# 		return array( 'abc' => false, 'count' => true );
-		return false;
-	}
-
 	/* Override getBody to apply LinksBatch on resultset before actually outputting anything. */
 	public function getBody() {
 		$batch = new LinkBatch;
@@ -88,7 +75,7 @@ class CategoryPager extends AlphabeticPager {
 		$this->mResult->rewind();
 
 		foreach ( $this->mResult as $row ) {
-			$batch->addObj( Title::makeTitleSafe( NS_CATEGORY, $row->cat_title ) );
+			$batch->addObj( new TitleValue( NS_CATEGORY, $row->cat_title ) );
 		}
 		$batch->execute();
 		$this->mResult->rewind();
@@ -99,7 +86,7 @@ class CategoryPager extends AlphabeticPager {
 	function formatRow( $result ) {
 		$title = new TitleValue( NS_CATEGORY, $result->cat_title );
 		$text = $title->getText();
-		$link = $this->linkRenderer->renderHtmlLink( $title, $text );
+		$link = $this->linkRenderer->makeLink( $title, $text );
 
 		$count = $this->msg( 'nmembers' )->numParams( $result->cat_pages )->escaped();
 		return Html::rawElement( 'li', null, $this->getLanguage()->specialList( $link, $count ) ) . "\n";