From: Kunal Mehta <legoktm@gmail.com>
Date: Sun, 3 Aug 2014 21:55:15 +0000 (-0700)
Subject: SpecialExpandTemplates: Use Config instead of globals
X-Git-Tag: 1.31.0-rc.0~14615^2
X-Git-Url: http://git.cyclocoop.org/%27%2C%20%20%20quote_amp%28%24url%29%2C%20%20%20%27?a=commitdiff_plain;h=7b8dd81dbc1baf2ac8f66240f428c88510e60bea;p=lhc%2Fweb%2Fwiklou.git

SpecialExpandTemplates: Use Config instead of globals

Change-Id: I84b1008a11aa12708231b6f460715a5cdd4f4e01
---

diff --git a/includes/specials/SpecialExpandTemplates.php b/includes/specials/SpecialExpandTemplates.php
index ecbd353dbb..60eec39214 100644
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -52,7 +52,7 @@ class SpecialExpandTemplates extends SpecialPage {
 	 * Show the special page
 	 */
 	function execute( $subpage ) {
-		global $wgParser, $wgUseTidy, $wgAlwaysUseTidy;
+		global $wgParser;
 
 		$this->setHeaders();
 
@@ -112,7 +112,8 @@ class SpecialExpandTemplates extends SpecialPage {
 				);
 			}
 
-			if ( ( $wgUseTidy && $options->getTidy() ) || $wgAlwaysUseTidy ) {
+			$config = $this->getConfig();
+			if ( ( $config->get( 'UseTidy' ) && $options->getTidy() ) || $config->get( 'AlwaysUseTidy' ) ) {
 				$tmp = MWTidy::tidy( $tmp );
 			}