(bug 4974) Don't follow redirected talk page on "new messages" link

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 097a9df..a7b5134 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -648,7 +648,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 4685) More fixes for Slovenian project namespace
 * Fixed and enhanced a little the Live Preview, which had been broken for some time
 * Added article size limit, $wgMaxArticleSize
-
+* (bug 4974) Don't follow redirected talk page on "new messages" link
 
 === Caveats ===
 

diff --git a/includes/Skin.php b/includes/Skin.php
index c0b7ba1..3b55ec9 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -606,7 +606,7 @@ END;
                        # 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(), wfMsgHtml( 'newmessageslink' ) );
+                               $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ), 'redirect=no' );
                                $dl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessagesdifflink' ), 'diff=cur' );
                                $s.= ' | <strong>'. wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
                                # disable caching

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 04c4882..865b834 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -272,7 +272,8 @@ class SkinTemplate extends Skin {
                                $ntl = wfMsg( 'youhavenewmessages',
                                        $this->makeKnownLinkObj(
                                                $usertalktitle,
-                                               wfMsgHtml( 'newmessageslink' )
+                                               wfMsgHtml( 'newmessageslink' ),
+                                               'redirect=no'
                                        ),
                                        $this->makeKnownLinkObj(
                                                $usertalktitle,