* changed variable list as per comment on r79954 left only wgDBtype

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

diff --git a/includes/ImageQueryPage.php b/includes/ImageQueryPage.php
index c50b0cc..aa9b6a6 100644 (file)
--- a/includes/ImageQueryPage.php
+++ b/includes/ImageQueryPage.php
@@ -28,33 +28,20 @@ abstract class ImageQueryPage extends QueryPage {
                        # $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 ) );
                                }
                        }
 
                        $out->addHTML( $gallery->toHtml() );
                }
        }
-       
+
        // Gotta override this since it's abstract
        function formatResult( $skin, $result ) { }
 
-       /**
-        * 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;
-       }
-
        /**
         * Get additional HTML to be shown in a results' cell
         *