Merge "Use the user from the context to format the date in Block::getPermissionsError()"

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

diff --git a/includes/specials/SpecialAllMessages.php b/includes/specials/SpecialAllMessages.php
index d44b94e..1e4e18b 100644 (file)
--- a/includes/specials/SpecialAllMessages.php
+++ b/includes/specials/SpecialAllMessages.php
@@ -51,15 +51,13 @@ class SpecialAllMessages extends SpecialPage {
 
                $this->setHeaders();
 
-               global $wgUseDatabaseMessages;
-               if ( !$wgUseDatabaseMessages ) {
+               if ( !$this->getConfig()->get( 'UseDatabaseMessages' ) ) {
                        $out->addWikiMsg( 'allmessagesnotsupportedDB' );
 
                        return;
-               } else {
-                       $this->outputHeader( 'allmessagestext' );
                }
 
+               $this->outputHeader( 'allmessagestext' );
                $out->addModuleStyles( 'mediawiki.special' );
 
                $this->table = new AllmessagesTablePager(
@@ -148,15 +146,13 @@ class AllMessagesTablePager extends TablePager {
        }
 
        function buildForm() {
-               global $wgScript;
-
                $attrs = array( 'id' => 'mw-allmessages-form-lang', 'name' => 'lang' );
                $msg = wfMessage( 'allmessages-language' );
                $langSelect = Xml::languageSelector( $this->langcode, false, null, $attrs, $msg );
 
                $out = Xml::openElement( 'form', array(
                                'method' => 'get',
-                               'action' => $wgScript,
+                               'action' => $this->getConfig()->get( 'Script' ),
                                'id' => 'mw-allmessages-form'
                        ) ) .
                        Xml::fieldset( $this->msg( 'allmessages-filter-legend' )->text() ) .