* (bug 20591) There's now a different message on Special:MovePage when $wgFixDoubleRe...

Based on a patch by The Evil IP address: https://bugzilla.wikimedia.org/attachment.cgi?id=7807

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6bbc2ba..5d4f669 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -424,6 +424,8 @@ LocalSettings.php. The specific bugs are listed below in the general notes.
   "File" and "Media" are allowed now
 * (bug 25872) Rename the HttpRequest class to MWHttpRequest to avoid conflict
   with php extension that defines same class.
+* (bug 20591) There's now a different message on Special:MovePage when
+  $wgFixDoubleRedirects is set to false.
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent.

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 72fb2af..94e085a 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3119,6 +3119,17 @@ You are responsible for making sure that links continue to point where they are
 Note that the page will '''not''' be moved if there is already a page at the new title, unless it is empty or a redirect and has no past edit history.
 This means that you can rename a page back to where it was renamed from if you make a mistake, and you cannot overwrite an existing page.
 
+'''Warning!'''
+This can be a drastic and unexpected change for a popular page;
+please be sure you understand the consequences of this before proceeding.",
+'movepagetext-noredirectfixer' => "Using the form below will rename a page, moving all of its history to the new name.
+The old title will become a redirect page to the new title.
+Be sure to check for [[Special:DoubleRedirects|double]] or [[Special:BrokenRedirects|broken redirects]].
+You are responsible for making sure that links continue to point where they are supposed to go.
+
+Note that the page will '''not''' be moved if there is already a page at the new title, unless it is empty or a redirect and has no past edit history.
+This means that you can rename a page back to where it was renamed from if you make a mistake, and you cannot overwrite an existing page.
+
 '''Warning!'''
 This can be a drastic and unexpected change for a popular page;
 please be sure you understand the consequences of this before proceeding.",

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 6d39843..6754ed4 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2105,6 +2105,7 @@ $wgMessageStructure = array(
                'move-page-backlink',
                'move-page-legend',
                'movepagetext',
+               'movepagetext-noredirectfixer',
                'movepagetalktext',
                'movearticle',
                'moveuserpage-warning',