Throw an error when the source and destination pages for mergehistory are the same.

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 0460c20..8756c62 100644 (file)
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -96,8 +96,10 @@ class MergehistoryForm {
                                wfEscapeWikiText( $this->mDestObj->getPrefixedText() )
                        );
                }
-
-               // TODO: warn about target = dest?
+               
+               if ( $this->mTargetObj->equals( $this->mDestObj ) ) {
+                       $errors[] = wfMsgExt( 'mergehistory-same-destination', array( 'parse' ) );
+               }
 
                if ( count( $errors ) ) {
                        $this->showMergeForm();

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index f41083d..84afac3 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1328,6 +1328,7 @@ Note that using the navigation links will reset this column.',
 'mergehistory-invalid-destination' => 'Destination page must be a valid title.',
 'mergehistory-autocomment'         => 'Merged [[:$1]] into [[:$2]]',
 'mergehistory-comment'             => 'Merged [[:$1]] into [[:$2]]: $3',
+'mergehistory-same-destination'    => 'Source and destination pages cannot be the same',
 
 # Merge log
 'mergelog'           => 'Merge log',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 9278840..adc31da 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -678,6 +678,7 @@ $wgMessageStructure = array(
                'mergehistory-invalid-destination',
                'mergehistory-autocomment',
                'mergehistory-comment',
+               'mergehistory-same-destination',
        ),
        'mergelog' => array(
                'mergelog',