* (bug 16617) Add "talk" link to list of templates in edit mode

Based on a patch by Nakon

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2c04efc..00739e7 100644 (file)
--- 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 870112e..ec63357 100644 (file)
--- 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>';
                }