(bug 44) make 'Image' and 'Image_talk' compatibility aliases work for all languages...

diff --git a/includes/Setup.php b/includes/Setup.php
index 6f94c4f..cfb6a73 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -67,6 +67,14 @@ if ( empty( $wgFileStore['deleted']['directory'] ) ) {
  */
 $wgNamespaceProtection[NS_MEDIAWIKI] = 'editinterface';
 
+/**
+ * The canonical names of namespaces 6 and 7 are, as of v1.14, "File"
+ * and "File_talk".  The old names "Image" and "Image_talk" are
+ * retained as aliases for backwards compatibility.
+ */
+$wgNamespaceAliases['Image'] = NS_IMAGE;
+$wgNamespaceAliases['Image_talk'] = NS_IMAGE_TALK;
+
 /**
  * Initialise $wgLocalFileRepo from backwards-compatible settings
  */

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 2284cf2..005c9a1 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -101,10 +101,7 @@ $namespaceNames = array(
 /**
  * Array of namespace aliases, mapping from name to NS_xxx index
  */
-$namespaceAliases = array(
-       'Image'      => NS_IMAGE,
-       'Image_talk' => NS_IMAGE_TALK,
-);
+$namespaceAliases = array();
 
 /**
  * Skin names. If any key is not specified, the English one will be used.