From: Max Semenik <maxsem.wiki@gmail.com>
Date: Sat, 17 Mar 2018 00:26:17 +0000 (-0700)
Subject: Don't use deprecated NS_IMAGE*
X-Git-Tag: 1.31.0-rc.0~357^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=8a82749ce9135ac23aadfb36f445b793791c74f3

Don't use deprecated NS_IMAGE*

Change-Id: I3df00c8e55a79baa3f3727daeea6c9441113aebc
---

diff --git a/.phpcs.xml b/.phpcs.xml
index cd55428f63..d77d398d1f 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -22,8 +22,6 @@
 		<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
 		<exclude name="Generic.Files.OneObjectStructurePerFile.MultipleFound" />
 		<exclude name="MediaWiki.VariableAnalysis.ForbiddenGlobalVariables.ForbiddenGlobal$wgTitle" />
-		<exclude name="MediaWiki.Usage.DeprecatedConstantUsage.NS_IMAGE" />
-		<exclude name="MediaWiki.Usage.DeprecatedConstantUsage.NS_IMAGE_TALK" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.SpacingDocStar" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.SpacingDocTag" />
 		<exclude name="Squiz.Scope.MethodScope.Missing" />
diff --git a/includes/export/DumpNamespaceFilter.php b/includes/export/DumpNamespaceFilter.php
index 2b71db00f2..12b9b55eab 100644
--- a/includes/export/DumpNamespaceFilter.php
+++ b/includes/export/DumpNamespaceFilter.php
@@ -50,8 +50,8 @@ class DumpNamespaceFilter extends DumpFilter {
 			"NS_PROJECT_TALK"   => NS_PROJECT_TALK,
 			"NS_FILE"           => NS_FILE,
 			"NS_FILE_TALK"      => NS_FILE_TALK,
-			"NS_IMAGE"          => NS_IMAGE, // NS_IMAGE is an alias for NS_FILE
-			"NS_IMAGE_TALK"     => NS_IMAGE_TALK,
+			"NS_IMAGE"          => NS_FILE, // NS_IMAGE is an alias for NS_FILE
+			"NS_IMAGE_TALK"     => NS_FILE_TALK,
 			"NS_MEDIAWIKI"      => NS_MEDIAWIKI,
 			"NS_MEDIAWIKI_TALK" => NS_MEDIAWIKI_TALK,
 			"NS_TEMPLATE"       => NS_TEMPLATE,