From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 3 Dec 2011 13:29:22 +0100
Subject: Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing
---
 includes/ImageQueryPage.php | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

(limited to 'includes/ImageQueryPage.php')

diff --git a/includes/ImageQueryPage.php b/includes/ImageQueryPage.php
index 180201a2..f46974b2 100644
--- a/includes/ImageQueryPage.php
+++ b/includes/ImageQueryPage.php
@@ -7,15 +7,15 @@
  * @ingroup SpecialPage
  * @author Rob Church <robchur@gmail.com>
  */
-class ImageQueryPage extends QueryPage {
+abstract class ImageQueryPage extends QueryPage {
 
 	/**
 	 * Format and output report results using the given information plus
 	 * OutputPage
 	 *
 	 * @param $out OutputPage to print to
-	 * @param $skin Skin: user skin to use
-	 * @param $dbr Database (read) connection to use
+	 * @param $skin Skin: user skin to use [unused]
+	 * @param $dbr DatabaseBase (read) connection to use
 	 * @param $res Integer: result pointer
 	 * @param $num Integer: number of available result rows
 	 * @param $offset Integer: paging offset
@@ -23,14 +23,14 @@ class ImageQueryPage extends QueryPage {
 	protected function outputResults( $out, $skin, $dbr, $res, $num, $offset ) {
 		if( $num > 0 ) {
 			$gallery = new ImageGallery();
-			$gallery->useSkin( $skin );
 
 			# $res might contain the whole 1,000 rows, so we read up to
 			# $num [should update this to use a Pager]
 			for( $i = 0; $i < $num && $row = $dbr->fetchObject( $res ); $i++ ) {
-				$image = $this->prepareImage( $row );
-				if( $image ) {
-					$gallery->add( $image->getTitle(), $this->getCellHtml( $row ) );
+				$namespace = isset( $row->namespace ) ? $row->namespace : NS_FILE;
+				$title = Title::makeTitleSafe( $namespace, $row->title );
+				if ( $title instanceof Title && $title->getNamespace() == NS_FILE ) {
+					$gallery->add( $title, $this->getCellHtml( $row ) );
 				}
 			}
 
@@ -38,19 +38,8 @@ class ImageQueryPage extends QueryPage {
 		}
 	}
 
-	/**
-	 * Prepare an image object given a result row
-	 *
-	 * @param $row Object: result row
-	 * @return Image
-	 */
-	private function prepareImage( $row ) {
-		$namespace = isset( $row->namespace ) ? $row->namespace : NS_FILE;
-		$title = Title::makeTitleSafe( $namespace, $row->title );
-		return ( $title instanceof Title && $title->getNamespace() == NS_FILE )
-			? wfFindFile( $title )
-			: null;
-	}
+	// Gotta override this since it's abstract
+	function formatResult( $skin, $result ) { }
 
 	/**
 	 * Get additional HTML to be shown in a results' cell
-- 
cgit v1.2.2