From 76b83680c097af11b705bfc0ad0f7460745592fd Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Wed, 5 Apr 2006 22:19:37 +0000
Subject: [PATCH] * (bug 5467) Link to page histories in watchlist edit mode *
 Add in changes from 1.6 to release notes

---
 RELEASE-NOTES                 | 42 ++++++++---------------------------
 includes/SpecialWatchlist.php |  8 +++++--
 2 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 79df9078d1..aecd8a61cb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -18,39 +18,15 @@ will be made on the development trunk and appear in the next quarterly release.
 Those wishing to use the latest code instead of a branch release can obtain
 it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 
-
-=== What's new in 1.6 ===
-
-User interface:
-* The account creation form has been separated from the user login form.
-* Page protection/unprotection uses a new, expanded form
-
-Templates:
-* Categories and "what links here" now update as expected when adding or
-  removing links in a template.
-* Template parameters can now have default values, as {{{name|default value}}}
-
-Uploads:
-* Optional support for rasterizing SVG images to PNG for inline dislay
-
-Feeds:
-* Feed generation upgraded to Atom 1.0
-* Diffs in RSS and Atom feeds are now colored for improved readability.
-
-Database:
-* MySQL 3.23.x support dropped; 4.0 or later required
-* Experimental support for Unicode mode of MySQL 4.1/5.0 (moderately tested)
-* Experimental Oracle support (not well tested!)
-
-Anti-spam extension support:
-* Spam blacklist extension now has support for automated cleanup:
-  http://meta.wikimedia.org/wiki/SpamBlacklist_extension
-* Support for a captcha extension to restrict automated spam edits:
-  http://meta.wikimedia.org/wiki/ConfirmEdit_extension
-
-Numerous bug fixes and other behind-the-scenes changes have been made;
-see the file HISTORY for a complete change list.
-
+== Changes since 1.6 ==
+
+* (bug 5458) Fix double-URL encoding in block log link in contribs and contribs
+  link in block log
+* (bug 5462) Bogus missing patch warning in updater
+* (bug 5461) Use of deprecated "showhideminor" in Special:Recentchangeslinked
+* PHP warning when allow_call_time_pass_reference is off
+* Update to Finnish localization
+* (bug 5467) Link to page histories in watchlist edit mode
 
 == Compatibility ==
 
diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index 007d10aac6..af633ab869 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -199,9 +199,13 @@ function wfSpecialWatchlist( $par ) {
 					);
 				} else {
 					global $wgContLang;
+					$toolLinks = array();
 					$titleText = $titleObj->getPrefixedText();
 					$pageLink = $sk->makeLinkObj( $titleObj );
-					$talkLink = $sk->makeLinkObj( $titleObj->getTalkPage(), $wgLang->getNsText( NS_TALK ) );
+					$toolLinks[] = $sk->makeLinkObj( $titleObj->getTalkPage(), $wgLang->getNsText( NS_TALK ) );
+					if( $titleObj->exists() )
+						$toolLinks[] = $sk->makeKnownLinkObj( $titleObj, wfMsgHtml( 'history_short' ), 'action=history' );
+					$toolLinks = '(' . implode( ' | ', $toolLinks ) . ')';
 					$checkbox = '<input type="checkbox" name="id[]" value="' . htmlspecialchars( $titleObj->getPrefixedText() ) . '" /> ' . ( $wgContLang->isRTL() ? '&rlm;' : '&lrm;' );
 					if( $redir ) {
 						$spanopen = '<span class="watchlistredir">';
@@ -210,7 +214,7 @@ function wfSpecialWatchlist( $par ) {
 						$spanopen = $spanclosed = '';
 					}
 					
-					$wgOut->addHTML( "<li>{$checkbox}{$spanopen}{$pageLink}{$spanclosed} ({$talkLink})</li>\n" );
+					$wgOut->addHTML( "<li>{$checkbox}{$spanopen}{$pageLink}{$spanclosed} {$toolLinks}</li>\n" );
 				}
 			}
 			$wgOut->addHTML( '</ul>' );
-- 
2.20.1