Bye, bye $wgExtensionAliasesFiles (deprecated in 1.16).

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 4e1b16e..1c6a49c 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -25,6 +25,7 @@ production.
 * (bug 32470) Increase the length of ug_group.
 * (bug 32239) Removed wgEnableTooltipsAndAccesskeys.
 * Removed $wgVectorShowVariantName.
+* Removed $wgExtensionAliasesFiles. Use wgExtensionMessagesFiles.
 
 === New features in 1.19 ===
 * (bug 19838) Possibility to get all interwiki prefixes if the interwiki

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 592b3c2..9c9ce46 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4785,12 +4785,6 @@ $wgExtensionFunctions = array();
  */
 $wgExtensionMessagesFiles = array();
 
-/**
- * Aliases for special pages provided by extensions.
- * @deprecated since 1.16 Use $specialPageAliases in a file referred to by $wgExtensionMessagesFiles
- */
-$wgExtensionAliasesFiles = array();
-
 /**
  * Parser output hooks.
  * This is an associative array where the key is an extension-defined tag

diff --git a/includes/LocalisationCache.php b/includes/LocalisationCache.php
index 1d0ccc5..3b1f45c 100644 (file)
--- a/includes/LocalisationCache.php
+++ b/includes/LocalisationCache.php
@@ -548,7 +548,7 @@ class LocalisationCache {
         * @param $code
         */
        public function recache( $code ) {
-               global $wgExtensionMessagesFiles, $wgExtensionAliasesFiles;
+               global $wgExtensionMessagesFiles;
                wfProfileIn( __METHOD__ );
 
                if ( !$code ) {
@@ -643,22 +643,6 @@ class LocalisationCache {
                        }
                }
 
-               # Load deprecated $wgExtensionAliasesFiles
-               foreach ( $wgExtensionAliasesFiles as $fileName ) {
-                       $data = $this->readPHPFile( $fileName, 'aliases' );
-
-                       if ( !isset( $data['aliases'] ) ) {
-                               continue;
-                       }
-
-                       $used = $this->mergeExtensionItem( $codeSequence, 'specialPageAliases',
-                               $allData['specialPageAliases'], $data['aliases'] );
-
-                       if ( $used ) {
-                               $deps[] = new FileDependency( $fileName );
-                       }
-               }
-
                # Merge core data into extension data
                foreach ( $coreData as $key => $item ) {
                        $this->mergeItem( $key, $allData[$key], $item );
@@ -666,7 +650,6 @@ class LocalisationCache {
 
                # Add cache dependencies for any referenced globals
                $deps['wgExtensionMessagesFiles'] = new GlobalDependency( 'wgExtensionMessagesFiles' );
-               $deps['wgExtensionAliasesFiles'] = new GlobalDependency( 'wgExtensionAliasesFiles' );
                $deps['version'] = new ConstantDependency( 'MW_LC_VERSION' );
 
                # Add dependencies to the cache entry

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index d785c24..b5a911a 100644 (file)
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -47,7 +47,7 @@ class MergeMessageFileList extends Maintenance {
                        $mmfl['output'] = $this->getOption( 'output' );
                }
 
-               global $IP, $wgExtensionMessagesFiles, $wgExtensionAliasesFiles;
+               global $IP, $wgExtensionMessagesFiles;
                foreach ( $mmfl['setupFiles'] as $fileName ) {
                        if ( strval( $fileName ) === '' ) {
                                continue;
@@ -61,8 +61,7 @@ class MergeMessageFileList extends Maintenance {
                        "<" . "?php\n" .
                        "## This file is generated by mergeMessageFileList.php. Do not edit it directly.\n\n" .
                        "if ( defined( 'MW_NO_EXTENSION_MESSAGES' ) ) return;\n\n" .
-                       '$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n" .
-                       '$wgExtensionAliasesFiles = ' . var_export( $wgExtensionAliasesFiles, true ) . ";\n";
+                       '$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n";
 
                $dirs = array(
                        $IP,