Merge "Don't fallback from uk to ru"

[lhc/web/wiklou.git] / includes / skins / QuickTemplate.php

diff --git a/includes/skins/QuickTemplate.php b/includes/skins/QuickTemplate.php
index af2d5da..6686ae6 100644 (file)
--- a/includes/skins/QuickTemplate.php
+++ b/includes/skins/QuickTemplate.php
@@ -17,6 +17,7 @@
  *
  * @file
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * Generic wrapper for template functions, with interface
@@ -36,7 +37,7 @@ abstract class QuickTemplate {
                $this->translator = new MediaWikiI18N();
                if ( $config === null ) {
                        wfDebug( __METHOD__ . ' was called with no Config instance passed to it' );
-                       $config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' );
+                       $config = MediaWikiServices::getInstance()->getMainConfig();
                }
                $this->config = $config;
        }
@@ -103,7 +104,6 @@ abstract class QuickTemplate {
        /**
         * @private
         * @param string $str
-        * @return string
         */
        function text( $str ) {
                echo htmlspecialchars( $this->data[$str] );
@@ -112,7 +112,6 @@ abstract class QuickTemplate {
        /**
         * @private
         * @param string $str
-        * @return string
         */
        function html( $str ) {
                echo $this->data[$str];
@@ -121,7 +120,6 @@ abstract class QuickTemplate {
        /**
         * @private
         * @param string $str
-        * @return string
         */
        function msg( $str ) {
                echo htmlspecialchars( $this->translator->translate( $str ) );
@@ -130,7 +128,6 @@ abstract class QuickTemplate {
        /**
         * @private
         * @param string $str
-        * @return string
         */
        function msgHtml( $str ) {
                echo $this->translator->translate( $str );
@@ -140,7 +137,6 @@ abstract class QuickTemplate {
         * An ugly, ugly hack.
         * @private
         * @param string $str
-        * @return string
         */
        function msgWiki( $str ) {
                global $wgOut;