Update to MediaWiki 1.24.1

1 files changed, 61 insertions, 7 deletions

diff --git a/includes/specials/SpecialWantedcategories.php b/includes/specials/SpecialWantedcategories.php
index d2ffdb94..b8c0bb28 100644
--- a/includes/specials/SpecialWantedcategories.php
+++ b/includes/specials/SpecialWantedcategories.php
@@ -29,6 +29,7 @@
  * @ingroup SpecialPage
  */
 class WantedCategoriesPage extends WantedQueryPage {
+	private $currentCategoryCounts;
 
 	function __construct( $name = 'Wantedcategories' ) {
 		parent::__construct( $name );
@@ -37,9 +38,11 @@ class WantedCategoriesPage extends WantedQueryPage {
 	function getQueryInfo() {
 		return array(
 			'tables' => array( 'categorylinks', 'page' ),
-			'fields' => array( 'namespace' => NS_CATEGORY,
-					'title' => 'cl_to',
-					'value' => 'COUNT(*)' ),
+			'fields' => array(
+				'namespace' => NS_CATEGORY,
+				'title' => 'cl_to',
+				'value' => 'COUNT(*)'
+			),
 			'conds' => array( 'page_title IS NULL' ),
 			'options' => array( 'GROUP BY' => 'cl_to' ),
 			'join_conds' => array( 'page' => array( 'LEFT JOIN',
@@ -48,6 +51,37 @@ class WantedCategoriesPage extends WantedQueryPage {
 		);
 	}
 
+	function preprocessResults( $db, $res ) {
+		parent::preprocessResults( $db, $res );
+
+		$this->currentCategoryCounts = array();
+
+		if ( !$res->numRows() || !$this->isCached() ) {
+			return;
+		}
+
+		// Fetch (hopefully) up-to-date numbers of pages in each category.
+		// This should be fast enough as we limit the list to a reasonable length.
+
+		$allCategories = array();
+		foreach ( $res as $row ) {
+			$allCategories[] = $row->title;
+		}
+
+		$categoryRes = $db->select(
+			'category',
+			array( 'cat_title', 'cat_pages' ),
+			array( 'cat_title' => $allCategories ),
+			__METHOD__
+		);
+		foreach ( $categoryRes as $row ) {
+			$this->currentCategoryCounts[$row->cat_title] = intval( $row->cat_pages );
+		}
+
+		// Back to start for display
+		$res->seek( 0 );
+	}
+
 	/**
 	 * @param Skin $skin
 	 * @param object $result Result row
@@ -59,17 +93,37 @@ class WantedCategoriesPage extends WantedQueryPage {
 		$nt = Title::makeTitle( $result->namespace, $result->title );
 		$text = htmlspecialchars( $wgContLang->convert( $nt->getText() ) );
 
-		$plink = $this->isCached() ?
-			Linker::link( $nt, $text ) :
-			Linker::link(
+		if ( !$this->isCached() ) {
+			// We can assume the freshest data
+			$plink = Linker::link(
 				$nt,
 				$text,
 				array(),
 				array(),
 				array( 'broken' )
 			);
+			$nlinks = $this->msg( 'nmembers' )->numParams( $result->value )->escaped();
+		} else {
+			$plink = Linker::link( $nt, $text );
+
+			$currentValue = isset( $this->currentCategoryCounts[$result->title] )
+				? $this->currentCategoryCounts[$result->title]
+				: 0;
+
+			// If the category has been created or emptied since the list was refreshed, strike it
+			if ( $nt->isKnown() || $currentValue === 0 ) {
+				$plink = "<del>$plink</del>";
+			}
+
+			// Show the current number of category entries if it changed
+			if ( $currentValue !== $result->value ) {
+				$nlinks = $this->msg( 'nmemberschanged' )
+					->numParams( $result->value, $currentValue )->escaped();
+			} else {
+				$nlinks = $this->msg( 'nmembers' )->numParams( $result->value )->escaped();
+			}
+		}
 
-		$nlinks = $this->msg( 'nmembers' )->numParams( $result->value )->escaped();
 		return $this->getLanguage()->specialList( $plink, $nlinks );
 	}