Merge "Use {{int:}} on MediaWiki:Blockedtext and MediaWiki:Autoblockedtext"

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

diff --git a/includes/skins/QuickTemplate.php b/includes/skins/QuickTemplate.php
index e8466dc..aa20e20 100644 (file)
--- a/includes/skins/QuickTemplate.php
+++ b/includes/skins/QuickTemplate.php
@@ -31,11 +31,6 @@ abstract class QuickTemplate {
         */
        public $data;
 
-       /**
-        * @var MediaWikiI18N
-        */
-       public $translator;
-
        /** @var Config $config */
        protected $config;
 
@@ -44,7 +39,6 @@ abstract class QuickTemplate {
         */
        function __construct( Config $config = null ) {
                $this->data = [];
-               $this->translator = new MediaWikiI18N();
                if ( $config === null ) {
                        wfDebug( __METHOD__ . ' was called with no Config instance passed to it' );
                        $config = MediaWikiServices::getInstance()->getMainConfig();
@@ -102,16 +96,6 @@ abstract class QuickTemplate {
                $this->data[$name] =& $value;
        }
 
-       /**
-        * @param MediaWikiI18N &$t
-        * @deprecate since 1.31 Use BaseTemplate::msg() or Skin::msg() instead for setting
-        *  message parameters.
-        */
-       public function setTranslator( &$t ) {
-               wfDeprecated( __METHOD__, '1.31' );
-               $this->translator = &$t;
-       }
-
        /**
         * Main function, used by classes that subclass QuickTemplate
         * to show the actual HTML output
@@ -153,7 +137,7 @@ abstract class QuickTemplate {
        /**
         * An ugly, ugly hack.
         * @private
-        * @param string $str
+        * @param string $msgKey
         */
        function msgWiki( $msgKey ) {
                global $wgOut;