From 4d31bb4aa576b2cba45a2c1639ca95d43a1e6080 Mon Sep 17 00:00:00 2001
From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Sat, 27 Dec 2008 21:15:27 +0000
Subject: [PATCH] * (bug 16617) Add "talk" link to list of templates in edit
 mode Based on a patch by Nakon

---
 RELEASE-NOTES       | 1 +
 includes/Linker.php | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2c04efc972..00739e726d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -252,6 +252,7 @@ The following extensions are migrated into MediaWiki 1.14:
   'li' elements
 * (bug 16754) Making arbitrary rows of sortable tables sticky:
   |- class="unsortable"
+* (bug 16617) Add "talk" link to list of templates in edit mode
 
 === Bug fixes in 1.14 ===
 
diff --git a/includes/Linker.php b/includes/Linker.php
index 870112efa9..ec633578b8 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1633,11 +1633,13 @@ class Linker {
 					$protected = '';
 				}
 				if( $titleObj->quickUserCan( 'edit' ) ) {
-					$editLink = $sk->makeLinkObj( $titleObj, wfMsg('editlink'), 'action=edit' );
+					$editLink = $sk->link( $titleObj, wfMsg( 'editlink' ), array(), array( 'action' => 'edit' ), 'known' );
 				} else {
-					$editLink = $sk->makeLinkObj( $titleObj, wfMsg('viewsourcelink'), 'action=edit' );
+					$editLink = $sk->link( $titleObj, wfMsg( 'viewsourcelink' ), array(), array( 'action' => 'edit' ), 'known' );
 				}
-				$outText .= '<li>' . $sk->link( $titleObj ) . ' (' . $editLink . ') ' . $protected . '</li>';
+				$talkLink = $sk->link( $titleObj->getTalkPage(), wfMsg( 'talkpagelinktext' ) );
+				$outText .= Xml::tags( 'li', array(),
+						$sk->link( $titleObj ) . ' (' . $editLink . ' ' . wfMsg( 'pipe-separator' ) . ' ' . $talkLink . ') ' . $protected );
 			}
 			$outText .= '</ul>';
 		}
-- 
2.20.1