Merge "Convert article delete to use OOUI"

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

diff --git a/includes/skins/QuickTemplate.php b/includes/skins/QuickTemplate.php
index e5d272c..e0ceab5 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
@@ -25,6 +26,16 @@
  */
 abstract class QuickTemplate {
 
+       /**
+        * @var array
+        */
+       public $data;
+
+       /**
+        * @var MediaWikiI18N
+        */
+       public $translator;
+
        /** @var Config $config */
        protected $config;
 
@@ -36,7 +47,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;
        }