Index: trunk/phase3/includes/Linker.php |
— | — | @@ -1633,11 +1633,13 @@ |
1634 | 1634 | $protected = ''; |
1635 | 1635 | } |
1636 | 1636 | if( $titleObj->quickUserCan( 'edit' ) ) { |
1637 | | - $editLink = $sk->makeLinkObj( $titleObj, wfMsg('editlink'), 'action=edit' ); |
| 1637 | + $editLink = $sk->link( $titleObj, wfMsg( 'editlink' ), array(), array( 'action' => 'edit' ), 'known' ); |
1638 | 1638 | } else { |
1639 | | - $editLink = $sk->makeLinkObj( $titleObj, wfMsg('viewsourcelink'), 'action=edit' ); |
| 1639 | + $editLink = $sk->link( $titleObj, wfMsg( 'viewsourcelink' ), array(), array( 'action' => 'edit' ), 'known' ); |
1640 | 1640 | } |
1641 | | - $outText .= '<li>' . $sk->link( $titleObj ) . ' (' . $editLink . ') ' . $protected . '</li>'; |
| 1641 | + $talkLink = $sk->link( $titleObj->getTalkPage(), wfMsg( 'talkpagelinktext' ) ); |
| 1642 | + $outText .= Xml::tags( 'li', array(), |
| 1643 | + $sk->link( $titleObj ) . ' (' . $editLink . ' ' . wfMsg( 'pipe-separator' ) . ' ' . $talkLink . ') ' . $protected ); |
1642 | 1644 | } |
1643 | 1645 | $outText .= '</ul>'; |
1644 | 1646 | } |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -252,6 +252,7 @@ |
253 | 253 | 'li' elements |
254 | 254 | * (bug 16754) Making arbitrary rows of sortable tables sticky: |
255 | 255 | |- class="unsortable" |
| 256 | +* (bug 16617) Add "talk" link to list of templates in edit mode |
256 | 257 | |
257 | 258 | === Bug fixes in 1.14 === |
258 | 259 | |