From a79fa8090e2d56b4d94a52d61c8265e155da3158 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 31 Dec 2008 19:16:37 +0000 Subject: [PATCH] Revert r45106 "(bug 16617) Add "talk" link to list of templates in edit mode" Clutters the interface unnecessarily, and uses link texts which don't even match in formatting, making it very unattractive. --- RELEASE-NOTES | 1 - includes/Linker.php | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index d93fe42fba..8c16777fbe 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -252,7 +252,6 @@ 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 * Show subversion too even if a "normal" version number is available * (bug 16121) Add a note that a page move was without creating a redirect in the move log diff --git a/includes/Linker.php b/includes/Linker.php index a28352dcf6..e323e47309 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1630,13 +1630,11 @@ class Linker { $protected = ''; } if( $titleObj->quickUserCan( 'edit' ) ) { - $editLink = $this->link( $titleObj, wfMsgHtml( 'editlink' ), array(), array( 'action' => 'edit' ), 'known' ); + $editLink = $this->makeLinkObj( $titleObj, wfMsg('editlink'), 'action=edit' ); } else { - $editLink = $this->link( $titleObj, wfMsgHtml( 'viewsourcelink' ), array(), array( 'action' => 'edit' ), 'known' ); + $editLink = $this->makeLinkObj( $titleObj, wfMsg('viewsourcelink'), 'action=edit' ); } - $talkLink = $this->link( $titleObj->getTalkPage(), wfMsgHtml( 'talkpagelinktext' ) ); - $outText .= Xml::tags( 'li', array(), - $this->link( $titleObj ) . ' (' . $editLink . ' ' . wfMsgHtml( 'pipe-separator' ) . ' ' . $talkLink . ') ' . $protected ) . "\n"; + $outText .= '
  • ' . $this->link( $titleObj ) . ' (' . $editLink . ') ' . $protected . '
    • '; } $outText .= ''; } -- 2.20.1