(bug 18346) Automatically hide RC log items on block too

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

diff --git a/includes/ImageQueryPage.php b/includes/ImageQueryPage.php
index 93f090a..3ab0b85 100644 (file)
--- a/includes/ImageQueryPage.php
+++ b/includes/ImageQueryPage.php
@@ -4,8 +4,7 @@
  * Variant of QueryPage which uses a gallery to output results, thus
  * suited for reports generating images
  *
- * @package MediaWiki
- * @addtogroup SpecialPage
+ * @ingroup SpecialPage
  * @author Rob Church <robchur@gmail.com>
  */
 class ImageQueryPage extends QueryPage {
@@ -30,12 +29,12 @@ class ImageQueryPage extends QueryPage {
                        # $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() );
                }
        }
 
@@ -46,10 +45,10 @@ 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;
        }
 
@@ -64,5 +63,3 @@ class ImageQueryPage extends QueryPage {
        }
 
 }
-
-?>