From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 includes/specials/SpecialMostcategories.php | 48 +++++++++++++++++++----------
 1 file changed, 31 insertions(+), 17 deletions(-)

(limited to 'includes/specials/SpecialMostcategories.php')

diff --git a/includes/specials/SpecialMostcategories.php b/includes/specials/SpecialMostcategories.php
index 11f26bd7..9b67f343 100644
--- a/includes/specials/SpecialMostcategories.php
+++ b/includes/specials/SpecialMostcategories.php
@@ -30,7 +30,6 @@
  * @ingroup SpecialPage
  */
 class MostcategoriesPage extends QueryPage {
-
 	function __construct( $name = 'Mostcategories' ) {
 		parent::__construct( $name );
 	}
@@ -44,22 +43,30 @@ class MostcategoriesPage extends QueryPage {
 	}
 
 	function getQueryInfo() {
-		return array (
-			'tables' => array ( 'categorylinks', 'page' ),
-			'fields' => array ( 'namespace' => 'page_namespace',
-					'title' => 'page_title',
-					'value' => 'COUNT(*)' ),
-			'conds' => array ( 'page_namespace' => MWNamespace::getContentNamespaces() ),
-			'options' => array ( 'HAVING' => 'COUNT(*) > 1',
-				'GROUP BY' => array( 'page_namespace', 'page_title' ) ),
-			'join_conds' => array ( 'page' => array ( 'LEFT JOIN',
-					'page_id = cl_from' ) )
+		return array(
+			'tables' => array( 'categorylinks', 'page' ),
+			'fields' => array(
+				'namespace' => 'page_namespace',
+				'title' => 'page_title',
+				'value' => 'COUNT(*)'
+			),
+			'conds' => array( 'page_namespace' => MWNamespace::getContentNamespaces() ),
+			'options' => array(
+				'HAVING' => 'COUNT(*) > 1',
+				'GROUP BY' => array( 'page_namespace', 'page_title' )
+			),
+			'join_conds' => array(
+				'page' => array(
+					'LEFT JOIN',
+					'page_id = cl_from'
+				)
+			)
 		);
 	}
 
 	/**
-	 * @param $db DatabaseBase
-	 * @param $res
+	 * @param DatabaseBase $db
+	 * @param ResultWrapper $res
 	 */
 	function preprocessResults( $db, $res ) {
 		# There's no point doing a batch check if we aren't caching results;
@@ -78,15 +85,22 @@ class MostcategoriesPage extends QueryPage {
 	}
 
 	/**
-	 * @param $skin Skin
-	 * @param $result
+	 * @param Skin $skin
+	 * @param object $result Result row
 	 * @return string
 	 */
 	function formatResult( $skin, $result ) {
 		$title = Title::makeTitleSafe( $result->namespace, $result->title );
 		if ( !$title ) {
-			return Html::element( 'span', array( 'class' => 'mw-invalidtitle' ),
-				Linker::getInvalidTitleDescription( $this->getContext(), $result->namespace, $result->title ) );
+			return Html::element(
+				'span',
+				array( 'class' => 'mw-invalidtitle' ),
+				Linker::getInvalidTitleDescription(
+					$this->getContext(),
+					$result->namespace,
+					$result->title
+				)
+			);
 		}
 
 		if ( $this->isCached() ) {
-- 
cgit v1.2.3-54-g00ecf