From a5346f0439c6734c424fd4a36eda3baa46da2dc2 Mon Sep 17 00:00:00 2001
From: Max Semenik <maxsem@users.mediawiki.org>
Date: Sun, 22 Aug 2010 10:06:06 +0000
Subject: [PATCH] "Difference between pages" is now displayed instead of
 "Difference between revisions" on diffs when appropriate. This is even more
 important now that we have Special:ComparePages

---
 includes/diff/DifferenceInterface.php | 6 +++++-
 languages/messages/MessagesEn.php     | 1 +
 languages/messages/MessagesQqq.php    | 2 ++
 maintenance/language/messages.inc     | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php
index 9ff611e944..9cbee31a09 100644
--- a/includes/diff/DifferenceInterface.php
+++ b/includes/diff/DifferenceInterface.php
@@ -186,7 +186,11 @@ CONTROL;
 		} else {
 			$wgOut->setPageTitle( $oldTitle . ', ' . $newTitle );
 		}
-		$wgOut->setSubtitle( wfMsgExt( 'difference', array( 'parseinline' ) ) );
+		if ( $this->mNewPage->equals( $this->mOldPage ) ) {
+			$wgOut->setSubtitle( wfMsgExt( 'difference', array( 'parseinline' ) ) );
+		} else {
+			$wgOut->setSubtitle( wfMsgExt( 'difference-multipage', array( 'parseinline' ) ) );
+		}
 		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 
 		if ( !$this->mOldPage->userCanRead() || !$this->mNewPage->userCanRead() ) {
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 3a39197635..77c2090b91 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1624,6 +1624,7 @@ Note that using the navigation links will reset this column.',
 # Diffs
 'history-title'            => 'Revision history of "$1"',
 'difference'               => '(Difference between revisions)',
+'difference-multipage'     => '(Difference between pages)',
 'lineno'                   => 'Line $1:',
 'compareselectedversions'  => 'Compare selected revisions',
 'showhideselectedversions' => 'Show/hide selected revisions',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 1f30dbd446..fef18c228f 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1167,6 +1167,8 @@ Please note that the parameters in a log entry will appear in the log only in th
 # Diffs
 'history-title'            => 'Displayed as page title when you click on the "history" tab. The parameter $1 is the normal page title.',
 'difference'               => 'Displayed under the title when viewing the difference between two or more edits.',
+'difference-multipage'     => 'Displayed under the title when viewing the difference between two or more pages.
+See also {{msg-mw|difference}}.',
 'lineno'                   => 'Message used when comparing different versions of a page (diff). $1 is a line number.',
 'compareselectedversions'  => 'Used as button in history pages.',
 'showhideselectedversions' => 'Text of the button which brings up the [[mw:RevisionDelete|RevisionDelete]] menu.',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 2d93cf65ad..01b8b214c5 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -809,6 +809,7 @@ $wgMessageStructure = array(
 	'diffs' => array(
 		'history-title',
 		'difference',
+		'difference-multipage',
 		'lineno',
 		'compareselectedversions',
 		'showhideselectedversions',
-- 
2.20.1