From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Wed, 21 Dec 2005 02:47:35 +0000 (+0000)
Subject: * (bug 1572) add a "diff penultimate revision" link to msg:newmessages
X-Git-Tag: 1.6.0~916
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=070d2d04d168657733353705ae63c70c63fffcb2;p=lhc%2Fweb%2Fwiklou.git

* (bug 1572) add a "diff penultimate revision" link to msg:newmessages
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 884e97877c..ade7a2331b 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -623,13 +623,12 @@ END;
 		}
 
 		if ( $wgUser->getNewtalk() ) {
-		# do not show "You have new messages" text when we are viewing our
-		# own talk page
-
+			# do not show "You have new messages" text when we are viewing our
+			# own talk page
 			if( !$wgTitle->equals( $wgUser->getTalkPage() ) ) {
-				$tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
-						wfMsg('newmessageslink') );
-				$s.= ' | <strong>'. wfMsg( 'newmessages', $tl ) . '</strong>';
+				$tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ) );
+				$dl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessagesdifflink' ) );
+				$s.= ' | <strong>'. wfMsg( 'newmessages', $tl, $dl ) . '</strong>';
 				# disable caching
 				$wgOut->setSquidMaxage(0);
 				$wgOut->enableClientCache(false);
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index d84e034e3d..241fc8501e 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -280,7 +280,12 @@ class SkinTemplate extends Skin {
 				$ntl = wfMsg( 'newmessages',
 					$this->makeKnownLinkObj(
 						$usertalktitle,
-						wfMsg('newmessageslink')
+						wfMsgHtml( 'newmessageslink' )
+					),
+					$this->makeKnownLinkObj(
+						$usertalktitle,
+						wfMsgHtml( 'newmessagesdifflink' ),
+						'diff=cur'
 					)
 				);
 				# Disable Cache
diff --git a/languages/Language.php b/languages/Language.php
index 8f19968637..49f122f2b4 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -495,8 +495,9 @@ See $1.',
 'pagetitle'		=> '$1 - {{SITENAME}}',
 'sitesubtitle'	=> '',
 'retrievedfrom' => 'Retrieved from "$1"',
-'newmessages' => 'You have $1.',
+'newmessages' => 'You have $1 ($2).',
 'newmessageslink' => 'new messages',
+'newmessagesdifflink' => 'diff to penultimate revision',
 'editsection'=>'edit',
 'toc' => 'Contents',
 'showtoc' => 'show',