Merge "Use Xml::element instead of Html::element for empty elements"

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

diff --git a/includes/specials/SpecialNewimages.php b/includes/specials/SpecialNewimages.php
index 1d06071..aff5947 100644 (file)
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -76,7 +76,7 @@ class NewFilesPager extends ReverseChronologicalPager {
        /**
         * @var ImageGallery
         */
-       var $gallery;
+       protected $gallery;
 
        function __construct( IContextSource $context, $par = null ) {
                $this->like = $context->getRequest()->getText( 'like' );
@@ -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 ) {
@@ -173,8 +172,6 @@ class NewFilesPager extends ReverseChronologicalPager {
        }
 
        function getForm() {
-               global $wgMiserMode;
-
                $fields = array(
                        'like' => array(
                                'type' => 'text',
@@ -183,7 +180,7 @@ class NewFilesPager extends ReverseChronologicalPager {
                        ),
                        'showbots' => array(
                                'type' => 'check',
-                               'label' => $this->msg( 'showhidebots', $this->msg( 'show' )->plain() )->escaped(),
+                               'label-message' => 'newimages-showbots',
                                'name' => 'showbots',
                        ),
                        'limit' => array(
@@ -198,7 +195,7 @@ class NewFilesPager extends ReverseChronologicalPager {
                        ),
                );
 
-               if ( $wgMiserMode ) {
+               if ( $this->getConfig()->get( 'MiserMode' ) ) {
                        unset( $fields['like'] );
                }