Merge "$.suggestions: make it possible to re-show suggestions"

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

diff --git a/includes/ImageQueryPage.php b/includes/ImageQueryPage.php
index c50b0cc..f9f6cee 100644 (file)
--- a/includes/ImageQueryPage.php
+++ b/includes/ImageQueryPage.php
@@ -1,4 +1,25 @@
 <?php
+/**
+ * Variant of QueryPage which uses a gallery to output results.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
+ */
 
 /**
  * Variant of QueryPage which uses a gallery to output results, thus
@@ -14,8 +35,8 @@ abstract class ImageQueryPage extends QueryPage {
         * 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,38 +44,24 @@ abstract 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 ) );
                                }
                        }
 
                        $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
         *