From: Siebrand Mazeland Date: Sat, 6 Jun 2009 17:00:20 +0000 (+0000) Subject: * replace use of deprecated makeLink() by link() in core X-Git-Tag: 1.31.0-rc.0~41475 X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=0d3a39aec4468b718d827adf6e97654a4744536c;p=lhc%2Fweb%2Fwiklou.git * replace use of deprecated makeLink() by link() in core * replace other deprecated Linker::*link*() methods in special pages --- diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php index 8a38bed728..fe88cd6746 100644 --- a/includes/ImageGallery.php +++ b/includes/ImageGallery.php @@ -250,8 +250,15 @@ class ImageGallery . htmlspecialchars( $nt->getText() ) . ''; } elseif( $this->mHideBadImages && wfIsBadImage( $nt->getDBkey(), $this->getContextTitle() ) ) { # The image is blacklisted, just show it as a text link. - $thumbhtml = "\n\t\t\t".'
' - . $sk->makeKnownLinkObj( $nt, htmlspecialchars( $nt->getText() ) ) . '
'; + $thumbhtml = "\n\t\t\t".'
' . + $sk->link( + $nt, + htmlspecialchars( $nt->getText() ), + array() + array(), + array( 'known', 'noclasses' ) + ) . + '
'; } elseif( !( $thumb = $img->transform( $params ) ) ) { # Error generating thumbnail. $thumbhtml = "\n\t\t\t".'
' @@ -274,7 +281,8 @@ class ImageGallery } //TODO - //$ul = $sk->makeLink( $wgContLang->getNsText( MWNamespace::getUser() ) . ":{$ut}", $ut ); + // $linkTarget = Title::newFromText( $wgContLang->getNsText( MWNamespace::getUser() ) . ":{$ut}" ); + // $ul = $sk->link( $linkTarget, $ut ); if( $this->mShowBytes ) { if( $img ) { @@ -289,7 +297,13 @@ class ImageGallery } $textlink = $this->mShowFilename ? - $sk->makeKnownLinkObj( $nt, htmlspecialchars( $wgLang->truncate( $nt->getText(), 20 ) ) ) . "
\n" : + $sk->link( + $nt, + htmlspecialchars( $wgLang->truncate( $nt->getText(), 20 ) ) + array(), + array(), + array( 'known', 'noclasses' ) + ) . "
\n" : '' ; # ATTENTION: The newline after
is needed to accommodate htmltidy which diff --git a/includes/Linker.php b/includes/Linker.php index b5975ba1ea..1ea9800b01 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1345,7 +1345,12 @@ class Linker { $linkRegexp = '/\[\[(.*?)\]\]' . preg_quote( $trail, '/' ) . '/'; if (isset($match[1][0]) && $match[1][0] == ':') $match[1] = substr($match[1], 1); - $thelink = $this->makeLink( $match[1], $text, "", $trail ); + list( $inside, $trail ) = Linker::splitTrail( $trail ); + $linkTarget = Title::newFromText( $match[1] ); + $thelink = $this->link( + linkTarget, + $text . $inside, + ) . $trail; } $comment = preg_replace( $linkRegexp, StringUtils::escapeRegexReplacement( $thelink ), $comment, 1 ); diff --git a/includes/specials/SpecialFileDuplicateSearch.php b/includes/specials/SpecialFileDuplicateSearch.php index 65d32b8688..716669337c 100644 --- a/includes/specials/SpecialFileDuplicateSearch.php +++ b/includes/specials/SpecialFileDuplicateSearch.php @@ -51,7 +51,10 @@ class FileDuplicateSearchPage extends QueryPage { $nt = Title::makeTitle( NS_FILE, $result->title ); $text = $wgContLang->convert( $nt->getText() ); - $plink = $skin->makeLink( $nt->getPrefixedText(), $text ); + $plink = $skin->link( + Title::newFromText( $nt->getPrefixedText() ), + $text + ); $user = $skin->link( Title::makeTitle( NS_USER, $result->img_user_text ), $result->img_user_text ); $time = $wgLang->timeanddate( $result->img_timestamp ); diff --git a/includes/specials/SpecialListgrouprights.php b/includes/specials/SpecialListgrouprights.php index b5c358ae7b..44cd024d02 100644 --- a/includes/specials/SpecialListgrouprights.php +++ b/includes/specials/SpecialListgrouprights.php @@ -61,14 +61,29 @@ class SpecialListGroupRights extends SpecialPage { // Do not make a link for the generic * group $grouppage = htmlspecialchars($groupnameLocalized); } else { - $grouppage = $this->skin->makeLink( $grouppageLocalized, htmlspecialchars($groupnameLocalized) ); + $grouppage = $this->skin->link( + Title::newFromText( $grouppageLocalized ), + htmlspecialchars($groupnameLocalized) + ); } if ( $group === 'user' ) { // Link to Special:listusers for implicit group 'user' - $grouplink = '
' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Listusers' ), wfMsgHtml( 'listgrouprights-members' ), '' ); + $grouplink = '
' . $this->skin->link( + SpecialPage::getTitleFor( 'Listusers' ), + wfMsgHtml( 'listgrouprights-members' ), + array(), + array(), + array( 'known', 'noclasses' ) + ); } elseif ( !in_array( $group, $wgImplicitGroups ) ) { - $grouplink = '
' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Listusers' ), wfMsgHtml( 'listgrouprights-members' ), 'group=' . $group ); + $grouplink = '
' . $this->skin->link( + SpecialPage::getTitleFor( 'Listusers' ), + wfMsgHtml( 'listgrouprights-members' ), + array(), + array( 'group' => $group ), + array( 'known', 'noclasses' ) + ); } else { // No link to Special:listusers for other implicit groups as they are unlistable $grouplink = ''; diff --git a/includes/specials/SpecialMIMEsearch.php b/includes/specials/SpecialMIMEsearch.php index 43fe3f6f8f..194836ed35 100644 --- a/includes/specials/SpecialMIMEsearch.php +++ b/includes/specials/SpecialMIMEsearch.php @@ -65,7 +65,10 @@ class MIMEsearchPage extends QueryPage { $nt = Title::makeTitle( $result->namespace, $result->title ); $text = $wgContLang->convert( $nt->getText() ); - $plink = $skin->makeLink( $nt->getPrefixedText(), htmlspecialchars($text) ); + $plink = $skin->link( + Title::newFromText( $nt->getPrefixedText() ), + htmlspecialchars( $text ) + ); $download = $skin->makeMediaLinkObj( $nt, wfMsgHtml( 'download' ) ); $bytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'), diff --git a/includes/specials/SpecialStatistics.php b/includes/specials/SpecialStatistics.php index 109c5c3025..5431eb8cb6 100644 --- a/includes/specials/SpecialStatistics.php +++ b/includes/specials/SpecialStatistics.php @@ -184,13 +184,19 @@ class SpecialStatistics extends SpecialPage { } else { $grouppageLocalized = $msg; } - $grouppage = $sk->makeLink( $grouppageLocalized, htmlspecialchars( $groupnameLocalized ) ); - $grouplink = $sk->link( SpecialPage::getTitleFor( 'Listusers' ), + $linkTarget = Title::newFromText( $grouppageLocalized ); + $grouppage = $sk->link( + $linkTarget, + htmlspecialchars( $groupnameLocalized ) + ); + $grouplink = $sk->link( + SpecialPage::getTitleFor( 'Listusers' ), wfMsgHtml( 'listgrouprights-members' ), array(), array( 'group' => $group ), - 'known' ); - # Add a class when a usergroup contains no members to allow hiding these rows + 'known' + ); + # Add a class when a usergroup contains no members to allow hiding these rows $classZero = ''; $countUsers = SiteStats::numberingroup( $groupname ); if( $countUsers == 0 ) {