| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -1426,7 +1426,8 @@ |
| 1427 | 1427 | |
| 1428 | 1428 | $out = ''; |
| 1429 | 1429 | if( $wgRightsPage ) { |
| 1430 | | - $link = $this->makeKnownLink( $wgRightsPage, $wgRightsText ); |
| | 1430 | + $title = Title::newFromText( $wgRightsPage ); |
| | 1431 | + $link = $this->linkKnown( $title, $wgRightsText ); |
| 1431 | 1432 | } elseif( $wgRightsUrl ) { |
| 1432 | 1433 | $link = $this->makeExternalLink( $wgRightsUrl, $wgRightsText ); |
| 1433 | 1434 | } elseif( $wgRightsText ) { |
| — | — | @@ -1544,8 +1545,11 @@ |
| 1545 | 1546 | } |
| 1546 | 1547 | |
| 1547 | 1548 | function copyrightLink() { |
| 1548 | | - $s = $this->makeKnownLink( wfMsgForContent( 'copyrightpage' ), |
| 1549 | | - wfMsg( 'copyrightpagename' ) ); |
| | 1549 | + $title = Title::newFromText( wfMsgForContent( 'copyrightpage' ) ); |
| | 1550 | + $s = $this->linkKnown( |
| | 1551 | + $title, |
| | 1552 | + wfMsg( 'copyrightpagename' ) |
| | 1553 | + ); |
| 1550 | 1554 | return $s; |
| 1551 | 1555 | } |
| 1552 | 1556 | |
| — | — | @@ -1558,8 +1562,11 @@ |
| 1559 | 1563 | // Otherwise, we display the link for the user, described in their |
| 1560 | 1564 | // language (which may or may not be the same as the default language), |
| 1561 | 1565 | // but we make the link target be the one site-wide page. |
| 1562 | | - return $this->makeKnownLink( wfMsgForContent( $page ), |
| 1563 | | - wfMsgExt( $desc, array( 'parsemag', 'escapenoentities' ) ) ); |
| | 1566 | + $title = Title::newFromText( $page ); |
| | 1567 | + return $this->linkKnown( |
| | 1568 | + $title, |
| | 1569 | + wfMsgExt( $desc, array( 'parsemag', 'escapenoentities' ) ) |
| | 1570 | + ); |
| 1564 | 1571 | } |
| 1565 | 1572 | } |
| 1566 | 1573 | |
| — | — | @@ -1673,11 +1680,11 @@ |
| 1674 | 1681 | if ( $this->mTitle->userIsWatching() ) { |
| 1675 | 1682 | $text = wfMsg( 'unwatchthispage' ); |
| 1676 | 1683 | $query = array( 'action' => 'unwatch' ); |
| 1677 | | - $id = array( 'mw-unwatch-link' => $this->mWatchLinkNum ); |
| | 1684 | + $id = 'mw-unwatch-link' . $this->mWatchLinkNum; |
| 1678 | 1685 | } else { |
| 1679 | 1686 | $text = wfMsg( 'watchthispage' ); |
| 1680 | 1687 | $query = array( 'action' => 'watch' ); |
| 1681 | | - $id = array( 'mw-watch-link' => $this->mWatchLinkNum ); |
| | 1688 | + $id = 'mw-watch-link' . $this->mWatchLinkNum; |
| 1682 | 1689 | } |
| 1683 | 1690 | |
| 1684 | 1691 | $s = $this->link( |