From: Kunal Mehta <legoktm@gmail.com>
Date: Thu, 29 Jan 2015 23:21:14 +0000 (-0800)
Subject: convertExtensionToRegistration: Still convert $wgTrackingCategories
X-Git-Tag: 1.31.0-rc.0~11801^2
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=024ad10b454175e5fc9462c7f87c988d4cce0eaf;p=lhc%2Fweb%2Fwiklou.git

convertExtensionToRegistration: Still convert $wgTrackingCategories

It's an attribute now rather than a global, but we still want
to convert it.

This follows up 247ecab445dcfe.

Change-Id: Ibb61b1689e3e6b454d7bf2f300ab465e30ca774a
---

diff --git a/maintenance/convertExtensionToRegistration.php b/maintenance/convertExtensionToRegistration.php
index a0dee3cc24..3cc0b5c214 100644
--- a/maintenance/convertExtensionToRegistration.php
+++ b/maintenance/convertExtensionToRegistration.php
@@ -14,6 +14,15 @@ class ConvertExtensionToRegistration extends Maintenance {
 		'ExtensionFunctions' => 'handleExtensionFunctions',
 	);
 
+	/**
+	 * Things that were formerly globals and should still be converted
+	 *
+	 * @var array
+	 */
+	protected $formerGlobals = array(
+		'TrackingCategories',
+	);
+
 	/**
 	 * Keys that should be put at the top of the generated JSON file (T86608)
 	 *
@@ -44,7 +53,7 @@ class ConvertExtensionToRegistration extends Maintenance {
 		$processor = new ReflectionClass( 'ExtensionProcessor' );
 		$settings = $processor->getProperty( 'globalSettings' );
 		$settings->setAccessible( true );
-		return $settings->getValue();
+		return $settings->getValue() + $this->formerGlobals;
 	}
 
 	public function execute() {