From acc5f8876250f6db8c6cb30e974fc4095ab91a19 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 30 Jul 2008 03:05:23 +0000
Subject: [PATCH] Remove unused $wgServer global.

---
 includes/ImageQueryPage.php | 49 ++++++++++++++++++++++++++++---------
 includes/OutputPage.php     |  2 +-
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/includes/ImageQueryPage.php b/includes/ImageQueryPage.php
index da9b6fd6f5..1685795979 100644
--- a/includes/ImageQueryPage.php
+++ b/includes/ImageQueryPage.php
@@ -9,6 +9,8 @@
  */
 class ImageQueryPage extends QueryPage {
 
+	var $mIsGallery = true;
+	
 	/**
 	 * Format and output report results using the given information plus
 	 * OutputPage
@@ -22,19 +24,36 @@ 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 ) );
+			if ( $this->mIsGallery ) {
+				$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 ) );
+					}
+				}
+				$html = $gallery->toHtml();
+			}
+			else {
+				global $wgUser, $wgLang;
+				$sk = $wgUser->getSkin();
+				$html = "<ol>\n";
+				for( $i = 0; $i < $num && $row = $dbr->fetchObject( $res ); $i++ ) {
+					$image = $this->prepareImage( $row );
+					if( $image ) {
+						$bytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'), $wgLang->formatNum( $image->getSize() ) );
+						$html .= "<li>" . $sk->makeKnownLinkObj( $image->getTitle(), $image->getTitle()->getText() ) . 
+								" (" . $bytes . ")</li>\n";
+					}
 				}
+				$html .= "</ol>\n";
 			}
 
-			$out->addHtml( $gallery->toHtml() );
+			$out->addHtml( $html );
 		}
 	}
 
@@ -51,7 +70,7 @@ class ImageQueryPage extends QueryPage {
 			? wfFindFile( $title )
 			: null;
 	}
-
+	
 	/**
 	 * Get additional HTML to be shown in a results' cell
 	 *
@@ -61,5 +80,11 @@ class ImageQueryPage extends QueryPage {
 	protected function getCellHtml( $row ) {
 		return '';
 	}
-
+	
+	/**
+	 * Is this to be output as a gallery? 
+	 */
+	public function setGallery( $val ) {
+		$this->mIsGallery = $val;
+	}
 }
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 219d1cb733..4fbdebde59 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -744,7 +744,7 @@ class OutputPage {
 		global $wgUser, $wgOutputEncoding, $wgRequest;
 		global $wgContLanguageCode, $wgDebugRedirects, $wgMimeType;
 		global $wgJsMimeType, $wgUseAjax, $wgAjaxSearch, $wgAjaxWatch;
-		global $wgServer, $wgEnableMWSuggest;
+		global $wgEnableMWSuggest;
 
 		if( $this->mDoNothing ){
 			return;
-- 
2.20.1