Merge "Deprecate ORMTable::getFieldPrefix"

[lhc/web/wiklou.git] / includes / specials / SpecialNewimages.php

diff --git a/includes/specials/SpecialNewimages.php b/includes/specials/SpecialNewimages.php
index 147d176..b9d1872 100644 (file)
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -89,7 +89,6 @@ class NewFilesPager extends ReverseChronologicalPager {
        }
 
        function getQueryInfo() {
-               global $wgMiserMode;
                $conds = $jconds = array();
                $tables = array( 'image' );
 
@@ -109,7 +108,7 @@ class NewFilesPager extends ReverseChronologicalPager {
                        }
                }
 
-               if ( !$wgMiserMode && $this->like !== null ) {
+               if ( !$this->getConfig()->get( 'MiserMode' ) && $this->like !== null ) {
                        $dbr = wfGetDB( DB_SLAVE );
                        $likeObj = Title::newFromURL( $this->like );
                        if ( $likeObj instanceof Title ) {
@@ -141,12 +140,11 @@ class NewFilesPager extends ReverseChronologicalPager {
                        // Note that null for mode is taken to mean use default.
                        $mode = $this->getRequest()->getVal( 'gallerymode', null );
                        try {
-                               $this->gallery = ImageGalleryBase::factory( $mode );
+                               $this->gallery = ImageGalleryBase::factory( $mode, $this->getContext() );
                        } catch ( MWException $e ) {
                                // User specified something invalid, fallback to default.
-                               $this->gallery = ImageGalleryBase::factory();
+                               $this->gallery = ImageGalleryBase::factory( false, $this->getContext() );
                        }
-                       $this->gallery->setContext( $this->getContext() );
                }
 
                return '';
@@ -173,8 +171,6 @@ class NewFilesPager extends ReverseChronologicalPager {
        }
 
        function getForm() {
-               global $wgMiserMode;
-
                $fields = array(
                        'like' => array(
                                'type' => 'text',
@@ -198,14 +194,17 @@ class NewFilesPager extends ReverseChronologicalPager {
                        ),
                );
 
-               if ( $wgMiserMode ) {
+               if ( $this->getConfig()->get( 'MiserMode' ) ) {
                        unset( $fields['like'] );
                }
 
                $context = new DerivativeContext( $this->getContext() );
                $context->setTitle( $this->getTitle() ); // Remove subpage
                $form = new HTMLForm( $fields, $context );
+
                $form->setSubmitTextMsg( 'ilsubmit' );
+               $form->setSubmitProgressive();
+
                $form->setMethod( 'get' );
                $form->setWrapperLegendMsg( 'newimages-legend' );