From: Rob Church <robchurch@users.mediawiki.org>
Date: Sun, 2 Apr 2006 15:42:27 +0000 (+0000)
Subject: (bug 2871) Links to talk pages in watchlist editing view
X-Git-Tag: 1.6.0~64
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=93319562612d6aa034aad63c4c61e13e4194056a;p=lhc%2Fweb%2Fwiklou.git

(bug 2871) Links to talk pages in watchlist editing view
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5c342939fd..9d0cd341f3 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -392,6 +392,7 @@ Special Pages:
 * Show links to user page, talk page and contributions page on Special:Newpages
 * Special:Export can now export a list of all contributors to an article (off by default)
 * (bug 5372) Add number of files to Special:Statistics
+* (bug 2871) Links to talk pages in watchlist editing view
 
 Misc.:
 * PHP 4.1 compatibility fix: don't use new_link parameter to mysql_connect
diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index 7f6653156f..ce1b09a4b1 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -155,6 +155,15 @@ function wfSpecialWatchlist( $par ) {
 		$sql = "SELECT wl_namespace,wl_title FROM $watchlist WHERE wl_user=$uid";
 
 		$res = $dbr->query( $sql, $fname );
+		
+		# Batch existence check
+		$linkBatch = new LinkBatch();
+		while( $row = $dbr->fetchObject( $res ) )
+			$linkBatch->addObj( Title::makeTitleSafe( $row->wl_namespace, $row->wl_title ) );
+		$linkBatch->execute();
+		if( $dbr->numRows( $res ) > 0 )
+			$dbr->dataSeek( $res, 0 ); # Let's do the time warp again!
+		
 		$sk = $wgUser->getSkin();
 
 		$list = array();
@@ -170,19 +179,19 @@ function wfSpecialWatchlist( $par ) {
 				$wgOut->addHTML( '<h2>' . $wgContLang->getFormattedNsText( $ns ) . '</h2>' );
 			$wgOut->addHTML( '<ul>' );
 			foreach($titles as $title) {
-				$t = Title::makeTitle( $ns, $title );
-				if( is_null( $t ) ) {
+				$titleObj = Title::makeTitle( $ns, $title );
+				if( is_null( $titleObj ) ) {
 					$wgOut->addHTML(
 						'<!-- bad title "' .
 						htmlspecialchars( $s->wl_title ) . '" in namespace ' . $s->wl_namespace . " -->\n"
 					);
 				} else {
 					global $wgContLang;
-					$t = $t->getPrefixedText();
+					$titleText = $titleObj->getPrefixedText();
+					$talkLink = $sk->makeLinkObj( $titleObj->getTalkPage(), $wgLang->getNsText( NS_TALK ) );
 					$wgOut->addHTML(
-						'<li><input type="checkbox" name="id[]" value="' . htmlspecialchars($t) . '" />' . ' ' . ($wgContLang->isRTL() ? '&rlm;' : '&lrm;') .
-						$sk->makeLink( $t, $t ) .
-						"</li>\n"
+						'<li><input type="checkbox" name="id[]" value="' . htmlspecialchars( $titleObj->getPrefixedText() ) . '" />' . ' ' . ( $wgContLang->isRTL() ? '&rlm;' : '&lrm;' ) .
+						$sk->makeLinkObj( $titleObj ) . " ({$talkLink}) </li>\n"
 					);
 				}
 			}