Slight fix for r47781: remove useless if($index) conditional: $index is always set...

[lhc/web/wiklou.git] / includes / ImageQueryPage.php

diff --git a/includes/ImageQueryPage.php b/includes/ImageQueryPage.php
index 65a50a4..3ab0b85 100644 (file)
--- a/includes/ImageQueryPage.php
+++ b/includes/ImageQueryPage.php
@@ -4,7 +4,7 @@
  * Variant of QueryPage which uses a gallery to output results, thus
  * suited for reports generating images
  *
- * @package MediaWiki
+ * @ingroup SpecialPage
  * @author Rob Church <robchur@gmail.com>
  */
 class ImageQueryPage extends QueryPage {
@@ -24,19 +24,20 @@ class ImageQueryPage extends QueryPage {
                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 instanceof Image )
-                                       $gallery->add( $image, $this->getCellHtml( $row ) );
+                               if( $image ) {
+                                       $gallery->add( $image->getTitle(), $this->getCellHtml( $row ) );
+                               }
                        }
-                       
-                       $out->addHtml( $gallery->toHtml() );
+
+                       $out->addHTML( $gallery->toHtml() );
                }
        }
-       
+
        /**
         * Prepare an image object given a result row
         *
@@ -44,13 +45,13 @@ class ImageQueryPage extends QueryPage {
         * @return Image
         */
        private function prepareImage( $row ) {
-               $namespace = isset( $row->namespace ) ? $row->namespace : NS_IMAGE;
+               $namespace = isset( $row->namespace ) ? $row->namespace : NS_FILE;
                $title = Title::makeTitleSafe( $namespace, $row->title );
-               return ( $title instanceof Title && $title->getNamespace() == NS_IMAGE )
-                       ? new Image( $title )
+               return ( $title instanceof Title && $title->getNamespace() == NS_FILE )
+                       ? wfFindFile( $title )
                        : null;
        }
-       
+
        /**
         * Get additional HTML to be shown in a results' cell
         *
@@ -62,5 +63,3 @@ class ImageQueryPage extends QueryPage {
        }
 
 }
-
-?>
\ No newline at end of file