dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c700fdc
)
Use link() instead of deprecated makeLinkObj() where possible.
author
Siebrand Mazeland
<siebrand@users.mediawiki.org>
Fri, 8 May 2009 23:24:31 +0000
(23:24 +0000)
committer
Siebrand Mazeland
<siebrand@users.mediawiki.org>
Fri, 8 May 2009 23:24:31 +0000
(23:24 +0000)
31 files changed:
includes/Article.php
patch
|
blob
|
history
includes/CategoryPage.php
patch
|
blob
|
history
includes/LogPage.php
patch
|
blob
|
history
includes/OutputPage.php
patch
|
blob
|
history
includes/PatrolLog.php
patch
|
blob
|
history
includes/Preferences.php
patch
|
blob
|
history
includes/ProtectionForm.php
patch
|
blob
|
history
includes/QueryPage.php
patch
|
blob
|
history
includes/User.php
patch
|
blob
|
history
includes/WatchlistEditor.php
patch
|
blob
|
history
includes/specials/SpecialBrokenRedirects.php
patch
|
blob
|
history
includes/specials/SpecialCategories.php
patch
|
blob
|
history
includes/specials/SpecialContributions.php
patch
|
blob
|
history
includes/specials/SpecialDeletedContributions.php
patch
|
blob
|
history
includes/specials/SpecialDoubleRedirects.php
patch
|
blob
|
history
includes/specials/SpecialFileDuplicateSearch.php
patch
|
blob
|
history
includes/specials/SpecialListfiles.php
patch
|
blob
|
history
includes/specials/SpecialListredirects.php
patch
|
blob
|
history
includes/specials/SpecialListusers.php
patch
|
blob
|
history
includes/specials/SpecialMIMEsearch.php
patch
|
blob
|
history
includes/specials/SpecialMostlinked.php
patch
|
blob
|
history
includes/specials/SpecialMostlinkedcategories.php
patch
|
blob
|
history
includes/specials/SpecialMostlinkedtemplates.php
patch
|
blob
|
history
includes/specials/SpecialMovepage.php
patch
|
blob
|
history
includes/specials/SpecialNewimages.php
patch
|
blob
|
history
includes/specials/SpecialProtectedpages.php
patch
|
blob
|
history
includes/specials/SpecialProtectedtitles.php
patch
|
blob
|
history
includes/specials/SpecialShortpages.php
patch
|
blob
|
history
includes/specials/SpecialUndelete.php
patch
|
blob
|
history
includes/specials/SpecialUnusedcategories.php
patch
|
blob
|
history
includes/specials/SpecialWantedcategories.php
patch
|
blob
|
history
diff --git
a/includes/Article.php
b/includes/Article.php
index
f10eafd
..
02c233c
100644
(file)
--- a/
includes/Article.php
+++ b/
includes/Article.php
@@
-1127,7
+1127,7
@@
class Article {
if( $forceKnown ) {
$link = $sk->makeKnownLinkObj( $title, htmlspecialchars( $title->getFullText() ) );
} else {
if( $forceKnown ) {
$link = $sk->makeKnownLinkObj( $title, htmlspecialchars( $title->getFullText() ) );
} else {
- $link = $sk->
makeLinkObj
( $title, htmlspecialchars( $title->getFullText() ) );
+ $link = $sk->
link
( $title, htmlspecialchars( $title->getFullText() ) );
}
// automatically append redirect=no to each link, since most of them are redirect pages themselves
foreach( $target as $rt ) {
}
// automatically append redirect=no to each link, since most of them are redirect pages themselves
foreach( $target as $rt ) {
@@
-1136,7
+1136,7
@@
class Article {
. $sk->makeKnownLinkObj( $rt, htmlspecialchars( $rt->getFullText() ) );
} else {
$link .= '<img src="'.$imageUrl2.'" alt="'.$alt2.' " />'
. $sk->makeKnownLinkObj( $rt, htmlspecialchars( $rt->getFullText() ) );
} else {
$link .= '<img src="'.$imageUrl2.'" alt="'.$alt2.' " />'
- . $sk->
makeLinkObj
( $rt, htmlspecialchars( $rt->getFullText() ) );
+ . $sk->
link
( $rt, htmlspecialchars( $rt->getFullText() ) );
}
}
return '<img src="'.$imageUrl.'" alt="#REDIRECT " />' .
}
}
return '<img src="'.$imageUrl.'" alt="#REDIRECT " />' .
diff --git
a/includes/CategoryPage.php
b/includes/CategoryPage.php
index
4d31773
..
5ba858f
100644
(file)
--- a/
includes/CategoryPage.php
+++ b/
includes/CategoryPage.php
@@
-452,13
+452,23
@@
class CategoryViewer {
$prevLink = wfMsgExt( 'prevn', array( 'escape', 'parsemag' ), $limitText );
if( $first != '' ) {
$prevLink = wfMsgExt( 'prevn', array( 'escape', 'parsemag' ), $limitText );
if( $first != '' ) {
- $prevLink = $sk->makeLinkObj( $title, $prevLink,
- wfArrayToCGI( $query + array( 'until' => $first ) ) );
+ query[] = array( 'until' => $first );
+ $prevLink = $sk->link(
+ $title,
+ $prevLink,
+ array(),
+ $query
+ );
}
$nextLink = wfMsgExt( 'nextn', array( 'escape', 'parsemag' ), $limitText );
if( $last != '' ) {
}
$nextLink = wfMsgExt( 'nextn', array( 'escape', 'parsemag' ), $limitText );
if( $last != '' ) {
- $nextLink = $sk->makeLinkObj( $title, $nextLink,
- wfArrayToCGI( $query + array( 'from' => $last ) ) );
+ query[] = array( 'from' => $last );
+ $nextLink = $sk->link(
+ $title,
+ $nextLink,
+ array(),
+ $query
+ );
}
return "($prevLink) ($nextLink)";
}
return "($prevLink) ($nextLink)";
diff --git
a/includes/LogPage.php
b/includes/LogPage.php
index
9faff81
..
39869cb
100644
(file)
--- a/
includes/LogPage.php
+++ b/
includes/LogPage.php
@@
-281,14
+281,21
@@
class LogPage {
}
switch( $type ) {
case 'move':
}
switch( $type ) {
case 'move':
- $titleLink = $skin->makeLinkObj( $title,
- htmlspecialchars( $title->getPrefixedText() ), 'redirect=no' );
+ $titleLink = $skin->link(
+ $title,
+ htmlspecialchars( $title->getPrefixedText() ),
+ array(),
+ array( 'redirect' => 'no' )
+ );
$targetTitle = Title::newFromText( $params[0] );
if ( !$targetTitle ) {
# Workaround for broken database
$params[0] = htmlspecialchars( $params[0] );
} else {
$targetTitle = Title::newFromText( $params[0] );
if ( !$targetTitle ) {
# Workaround for broken database
$params[0] = htmlspecialchars( $params[0] );
} else {
- $params[0] = $skin->makeLinkObj( $targetTitle, htmlspecialchars( $params[0] ) );
+ $params[0] = $skin->link(
+ $targetTitle,
+ htmlspecialchars( $params[0] )
+ );
}
break;
case 'block':
}
break;
case 'block':
@@
-304,11
+311,19
@@
class LogPage {
break;
case 'rights':
$text = $wgContLang->ucfirst( $title->getText() );
break;
case 'rights':
$text = $wgContLang->ucfirst( $title->getText() );
- $titleLink = $skin->
makeLinkObj
( Title::makeTitle( NS_USER, $text ) );
+ $titleLink = $skin->
link
( Title::makeTitle( NS_USER, $text ) );
break;
case 'merge':
break;
case 'merge':
- $titleLink = $skin->makeLinkObj( $title, $title->getPrefixedText(), 'redirect=no' );
- $params[0] = $skin->makeLinkObj( Title::newFromText( $params[0] ), htmlspecialchars( $params[0] ) );
+ $titleLink = $skin->link(
+ $title,
+ $title->getPrefixedText(),
+ array(),
+ array( 'redirect' => 'no' )
+ );
+ $params[0] = $skin->link(
+ Title::newFromText( $params[0] ),
+ htmlspecialchars( $params[0] )
+ );
$params[1] = $wgLang->timeanddate( $params[1] );
break;
default:
$params[1] = $wgLang->timeanddate( $params[1] );
break;
default:
@@
-316,12
+331,12
@@
class LogPage {
list( $name, $par ) = SpecialPage::resolveAliasWithSubpage( $title->getDBKey() );
# Use the language name for log titles, rather than Log/X
if( $name == 'Log' ) {
list( $name, $par ) = SpecialPage::resolveAliasWithSubpage( $title->getDBKey() );
# Use the language name for log titles, rather than Log/X
if( $name == 'Log' ) {
- $titleLink = '('.$skin->
makeLinkObj
( $title, LogPage::logName( $par ) ).')';
+ $titleLink = '('.$skin->
link
( $title, LogPage::logName( $par ) ).')';
} else {
} else {
- $titleLink = $skin->
makeLinkObj
( $title );
+ $titleLink = $skin->
link
( $title );
}
} else {
}
} else {
- $titleLink = $skin->
makeLinkObj
( $title );
+ $titleLink = $skin->
link
( $title );
}
}
return $titleLink;
}
}
return $titleLink;
diff --git
a/includes/OutputPage.php
b/includes/OutputPage.php
index
ab2b436
..
72940cc
100644
(file)
--- a/
includes/OutputPage.php
+++ b/
includes/OutputPage.php
@@
-458,7
+458,7
@@
class OutputPage {
if ( array_key_exists( $category, $categories ) )
continue;
$text = $wgContLang->convertHtml( $title->getText() );
if ( array_key_exists( $category, $categories ) )
continue;
$text = $wgContLang->convertHtml( $title->getText() );
- $this->mCategoryLinks[$type][] = $sk->
makeLinkObj
( $title, $text );
+ $this->mCategoryLinks[$type][] = $sk->
link
( $title, $text );
}
}
}
}
}
}
@@
-1444,7
+1444,7
@@
class OutputPage {
public function addReturnTo( $title ) {
global $wgUser;
$this->addLink( array( 'rel' => 'next', 'href' => $title->getFullUrl() ) );
public function addReturnTo( $title ) {
global $wgUser;
$this->addLink( array( 'rel' => 'next', 'href' => $title->getFullUrl() ) );
- $link = wfMsg( 'returnto', $wgUser->getSkin()->
makeLinkObj
( $title ) );
+ $link = wfMsg( 'returnto', $wgUser->getSkin()->
link
( $title ) );
$this->addHTML( "<p>{$link}</p>\n" );
}
$this->addHTML( "<p>{$link}</p>\n" );
}
diff --git
a/includes/PatrolLog.php
b/includes/PatrolLog.php
index
978821c
..
61512de
100644
(file)
--- a/
includes/PatrolLog.php
+++ b/
includes/PatrolLog.php
@@
-42,7
+42,7
@@
class PatrolLog {
list( $cur, /* $prev */, $auto ) = $params;
if( is_object( $skin ) ) {
# Standard link to the page in question
list( $cur, /* $prev */, $auto ) = $params;
if( is_object( $skin ) ) {
# Standard link to the page in question
- $link = $skin->
makeLinkObj
( $title );
+ $link = $skin->
link
( $title );
if( $title->exists() ) {
# Generate a diff link
$bits[] = 'oldid=' . urlencode( $cur );
if( $title->exists() ) {
# Generate a diff link
$bits[] = 'oldid=' . urlencode( $cur );
diff --git
a/includes/Preferences.php
b/includes/Preferences.php
index
652ac08
..
7bb8200
100644
(file)
--- a/
includes/Preferences.php
+++ b/
includes/Preferences.php
@@
-899,12
+899,12
@@
class Preferences {
global $wgAllowUserCss, $wgAllowUserJs;
if( $wgAllowUserCss ) {
$cssPage = Title::makeTitleSafe( NS_USER, $user->getName().'/'.$skinkey.'.css' );
global $wgAllowUserCss, $wgAllowUserJs;
if( $wgAllowUserCss ) {
$cssPage = Title::makeTitleSafe( NS_USER, $user->getName().'/'.$skinkey.'.css' );
- $customCSS = $sk->
makeLinkObj( $cssPage, wfMsgExt(
'prefs-custom-css', array() ) );
+ $customCSS = $sk->
link( $cssPage, wfMsgExt(
'prefs-custom-css', array() ) );
$extraLinks .= " ($customCSS)";
}
if( $wgAllowUserJs ) {
$jsPage = Title::makeTitleSafe( NS_USER, $user->getName().'/'.$skinkey.'.js' );
$extraLinks .= " ($customCSS)";
}
if( $wgAllowUserJs ) {
$jsPage = Title::makeTitleSafe( NS_USER, $user->getName().'/'.$skinkey.'.js' );
- $customJS = $sk->
makeLinkObj( $jsPage, wfMsgHtml('prefs-custom-js'
) );
+ $customJS = $sk->
link( $jsPage, wfMsgHtml( 'prefs-custom-js'
) );
$extraLinks .= " ($customJS)";
}
if( $skinkey == $wgDefaultSkin )
$extraLinks .= " ($customJS)";
}
if( $skinkey == $wgDefaultSkin )
diff --git
a/includes/ProtectionForm.php
b/includes/ProtectionForm.php
index
102c297
..
b93c840
100644
(file)
--- a/
includes/ProtectionForm.php
+++ b/
includes/ProtectionForm.php
@@
-196,7
+196,7
@@
class ProtectionForm {
}
$sk = $wgUser->getSkin();
}
$sk = $wgUser->getSkin();
- $titleLink = $sk->
makeLinkObj
( $this->mTitle );
+ $titleLink = $sk->
link
( $this->mTitle );
$wgOut->setPageTitle( wfMsg( 'protect-title', $this->mTitle->getPrefixedText() ) );
$wgOut->setSubtitle( wfMsg( 'protect-backlink', $titleLink ) );
$wgOut->setPageTitle( wfMsg( 'protect-title', $this->mTitle->getPrefixedText() ) );
$wgOut->setSubtitle( wfMsg( 'protect-backlink', $titleLink ) );
diff --git
a/includes/QueryPage.php
b/includes/QueryPage.php
index
6d26b5f
..
671fd5c
100644
(file)
--- a/
includes/QueryPage.php
+++ b/
includes/QueryPage.php
@@
-577,7
+577,7
@@
abstract class WantedQueryPage extends QueryPage {
if( $title instanceof Title ) {
if( $this->isCached() ) {
$pageLink = $title->exists()
if( $title instanceof Title ) {
if( $this->isCached() ) {
$pageLink = $title->exists()
- ? '<s>' . $skin->
makeLinkObj
( $title ) . '</s>'
+ ? '<s>' . $skin->
link
( $title ) . '</s>'
: $skin->makeBrokenLinkObj( $title );
} else {
$pageLink = $skin->makeBrokenLinkObj( $title );
: $skin->makeBrokenLinkObj( $title );
} else {
$pageLink = $skin->makeBrokenLinkObj( $title );
diff --git
a/includes/User.php
b/includes/User.php
index
4ab5785
..
d10bc34
100644
(file)
--- a/
includes/User.php
+++ b/
includes/User.php
@@
-3205,7
+3205,7
@@
class User {
if( $title ) {
global $wgUser;
$sk = $wgUser->getSkin();
if( $title ) {
global $wgUser;
$sk = $wgUser->getSkin();
- return $sk->
makeLinkObj
( $title, htmlspecialchars( $text ) );
+ return $sk->
link
( $title, htmlspecialchars( $text ) );
} else {
return $text;
}
} else {
return $text;
}
diff --git
a/includes/WatchlistEditor.php
b/includes/WatchlistEditor.php
index
82f62f6
..
9744aab
100644
(file)
--- a/
includes/WatchlistEditor.php
+++ b/
includes/WatchlistEditor.php
@@
-143,8
+143,8
@@
class WatchlistEditor {
if( !$title instanceof Title )
$title = Title::newFromText( $title );
if( $title instanceof Title ) {
if( !$title instanceof Title )
$title = Title::newFromText( $title );
if( $title instanceof Title ) {
- $output->addHTML( "<li>" . $skin->
makeLinkObj
( $title )
- . ' (' . $skin->
makeLinkObj
( $title->getTalkPage(), $talk ) . ")</li>\n" );
+ $output->addHTML( "<li>" . $skin->
link
( $title )
+ . ' (' . $skin->
link
( $title->getTalkPage(), $talk ) . ")</li>\n" );
}
}
$output->addHTML( "</ul>\n" );
}
}
$output->addHTML( "</ul>\n" );
@@
-409,10
+409,10
@@
class WatchlistEditor {
private function buildRemoveLine( $title, $redirect, $skin ) {
global $wgLang;
private function buildRemoveLine( $title, $redirect, $skin ) {
global $wgLang;
- $link = $skin->
makeLinkObj
( $title );
+ $link = $skin->
link
( $title );
if( $redirect )
$link = '<span class="watchlistredir">' . $link . '</span>';
if( $redirect )
$link = '<span class="watchlistredir">' . $link . '</span>';
- $tools[] = $skin->
makeLinkObj
( $title->getTalkPage(), wfMsgHtml( 'talkpagelinktext' ) );
+ $tools[] = $skin->
link
( $title->getTalkPage(), wfMsgHtml( 'talkpagelinktext' ) );
if( $title->exists() ) {
$tools[] = $skin->makeKnownLinkObj( $title, wfMsgHtml( 'history_short' ), 'action=history' );
}
if( $title->exists() ) {
$tools[] = $skin->makeKnownLinkObj( $title, wfMsgHtml( 'history_short' ), 'action=history' );
}
diff --git
a/includes/specials/SpecialBrokenRedirects.php
b/includes/specials/SpecialBrokenRedirects.php
index
0a16e6d
..
de33abc
100644
(file)
--- a/
includes/specials/SpecialBrokenRedirects.php
+++ b/
includes/specials/SpecialBrokenRedirects.php
@@
-61,7
+61,7
@@
class BrokenRedirectsPage extends PageQueryPage {
// $toObj may very easily be false if the $result list is cached
if ( !is_object( $toObj ) ) {
// $toObj may very easily be false if the $result list is cached
if ( !is_object( $toObj ) ) {
- return '<s>' . $skin->
makeLinkObj
( $fromObj ) . '</s>';
+ return '<s>' . $skin->
link
( $fromObj ) . '</s>';
}
$from = $skin->makeKnownLinkObj( $fromObj ,'', 'redirect=no' );
}
$from = $skin->makeKnownLinkObj( $fromObj ,'', 'redirect=no' );
diff --git
a/includes/specials/SpecialCategories.php
b/includes/specials/SpecialCategories.php
index
eefe8e1
..
fca0538
100644
(file)
--- a/
includes/specials/SpecialCategories.php
+++ b/
includes/specials/SpecialCategories.php
@@
-90,7
+90,7
@@
class CategoryPager extends AlphabeticPager {
function formatRow($result) {
global $wgLang;
$title = Title::makeTitle( NS_CATEGORY, $result->cat_title );
function formatRow($result) {
global $wgLang;
$title = Title::makeTitle( NS_CATEGORY, $result->cat_title );
- $titleText = $this->getSkin()->
makeLinkObj
( $title, htmlspecialchars( $title->getText() ) );
+ $titleText = $this->getSkin()->
link
( $title, htmlspecialchars( $title->getText() ) );
$count = wfMsgExt( 'nmembers', array( 'parsemag', 'escape' ),
$wgLang->formatNum( $result->cat_pages ) );
return Xml::tags('li', null, "$titleText ($count)" ) . "\n";
$count = wfMsgExt( 'nmembers', array( 'parsemag', 'escape' ),
$wgLang->formatNum( $result->cat_pages ) );
return Xml::tags('li', null, "$titleText ($count)" ) . "\n";
diff --git
a/includes/specials/SpecialContributions.php
b/includes/specials/SpecialContributions.php
index
a4037cb
..
62ec9c2
100644
(file)
--- a/
includes/specials/SpecialContributions.php
+++ b/
includes/specials/SpecialContributions.php
@@
-148,12
+148,12
@@
class SpecialContributions extends SpecialPage {
if( 0 == $id ) {
$user = $nt->getText();
} else {
if( 0 == $id ) {
$user = $nt->getText();
} else {
- $user = $sk->
makeLinkObj
( $nt, htmlspecialchars( $nt->getText() ) );
+ $user = $sk->
link
( $nt, htmlspecialchars( $nt->getText() ) );
}
$talk = $nt->getTalkPage();
if( $talk ) {
# Talk page link
}
$talk = $nt->getTalkPage();
if( $talk ) {
# Talk page link
- $tools[] = $sk->
makeLinkObj
( $talk, wfMsgHtml( 'sp-contributions-talk' ) );
+ $tools[] = $sk->
link
( $talk, wfMsgHtml( 'sp-contributions-talk' ) );
if( ( $id != 0 && $wgSysopUserBans ) || ( $id == 0 && IP::isIPAddress( $nt->getText() ) ) ) {
# Block link
if( $wgUser->isAllowed( 'block' ) )
if( ( $id != 0 && $wgSysopUserBans ) || ( $id == 0 && IP::isIPAddress( $nt->getText() ) ) ) {
# Block link
if( $wgUser->isAllowed( 'block' ) )
@@
-482,7
+482,12
@@
class ContribsPager extends ReverseChronologicalPager {
$page = Title::newFromRow( $row );
$page->resetArticleId( $row->rev_page ); // use process cache
$page = Title::newFromRow( $row );
$page->resetArticleId( $row->rev_page ); // use process cache
- $link = $sk->makeLinkObj( $page, $page->getPrefixedText(), $page->isRedirect() ? 'redirect=no' : '' );
+ $link = $sk->link(
+ $page,
+ $page->getPrefixedText(),
+ array(),
+ $page->isRedirect() ? array( 'redirect' => 'no' ) : array()
+ );
# Mark current revisions
$difftext = $topmarktext = '';
if( $row->rev_id == $row->page_latest ) {
# Mark current revisions
$difftext = $topmarktext = '';
if( $row->rev_id == $row->page_latest ) {
diff --git
a/includes/specials/SpecialDeletedContributions.php
b/includes/specials/SpecialDeletedContributions.php
index
9751736
..
d5dc371
100644
(file)
--- a/
includes/specials/SpecialDeletedContributions.php
+++ b/
includes/specials/SpecialDeletedContributions.php
@@
-155,7
+155,7
@@
class DeletedContribsPager extends IndexPager {
'×tamp=' . $rev->getTimestamp() );
}
'×tamp=' . $rev->getTimestamp() );
}
- $pagelink = $sk->
makeLinkObj
( $page );
+ $pagelink = $sk->
link
( $page );
if( $rev->isMinor() ) {
$mflag = '<span class="minor">' . $this->messages['minoreditletter'] . '</span> ';
if( $rev->isMinor() ) {
$mflag = '<span class="minor">' . $this->messages['minoreditletter'] . '</span> ';
@@
-304,12
+304,12
@@
class DeletedContributionsPage extends SpecialPage {
if ( 0 == $id ) {
$user = $nt->getText();
} else {
if ( 0 == $id ) {
$user = $nt->getText();
} else {
- $user = $sk->
makeLinkObj
( $nt, htmlspecialchars( $nt->getText() ) );
+ $user = $sk->
link
( $nt, htmlspecialchars( $nt->getText() ) );
}
$talk = $nt->getTalkPage();
if( $talk ) {
# Talk page link
}
$talk = $nt->getTalkPage();
if( $talk ) {
# Talk page link
- $tools[] = $sk->
makeLinkObj
( $talk, wfMsgHtml( 'talkpagelinktext' ) );
+ $tools[] = $sk->
link
( $talk, wfMsgHtml( 'talkpagelinktext' ) );
if( ( $id != 0 && $wgSysopUserBans ) || ( $id == 0 && User::isIP( $nt->getText() ) ) ) {
# Block link
if( $wgUser->isAllowed( 'block' ) )
if( ( $id != 0 && $wgSysopUserBans ) || ( $id == 0 && User::isIP( $nt->getText() ) ) ) {
# Block link
if( $wgUser->isAllowed( 'block' ) )
diff --git
a/includes/specials/SpecialDoubleRedirects.php
b/includes/specials/SpecialDoubleRedirects.php
index
b1bad0c
..
d97f4b4
100644
(file)
--- a/
includes/specials/SpecialDoubleRedirects.php
+++ b/
includes/specials/SpecialDoubleRedirects.php
@@
-74,7
+74,7
@@
class DoubleRedirectsPage extends PageQueryPage {
}
}
if ( !$result ) {
}
}
if ( !$result ) {
- return '<s>' . $skin->
makeLinkObj( $titleA, '', 'redirect=no'
) . '</s>';
+ return '<s>' . $skin->
link( $titleA, null, array(), array( 'redirect' => 'no' )
) . '</s>';
}
$titleB = Title::makeTitle( $result->nsb, $result->tb );
}
$titleB = Title::makeTitle( $result->nsb, $result->tb );
diff --git
a/includes/specials/SpecialFileDuplicateSearch.php
b/includes/specials/SpecialFileDuplicateSearch.php
index
4fde0a6
..
5bf205c
100644
(file)
--- a/
includes/specials/SpecialFileDuplicateSearch.php
+++ b/
includes/specials/SpecialFileDuplicateSearch.php
@@
-53,7
+53,7
@@
class FileDuplicateSearchPage extends QueryPage {
$text = $wgContLang->convert( $nt->getText() );
$plink = $skin->makeLink( $nt->getPrefixedText(), $text );
$text = $wgContLang->convert( $nt->getText() );
$plink = $skin->makeLink( $nt->getPrefixedText(), $text );
- $user = $skin->
makeLinkObj
( Title::makeTitle( NS_USER, $result->img_user_text ), $result->img_user_text );
+ $user = $skin->
link
( Title::makeTitle( NS_USER, $result->img_user_text ), $result->img_user_text );
$time = $wgLang->timeanddate( $result->img_timestamp );
return "$plink . . $user . . $time";
$time = $wgLang->timeanddate( $result->img_timestamp );
return "$plink . . $user . . $time";
diff --git
a/includes/specials/SpecialListfiles.php
b/includes/specials/SpecialListfiles.php
index
e15b695
..
fa23649
100644
(file)
--- a/
includes/specials/SpecialListfiles.php
+++ b/
includes/specials/SpecialListfiles.php
@@
-140,8
+140,10
@@
class ImageListPager extends TablePager {
return "$link ($download)";
case 'img_user_text':
if ( $this->mCurrentRow->img_user ) {
return "$link ($download)";
case 'img_user_text':
if ( $this->mCurrentRow->img_user ) {
- $link = $this->getSkin()->makeLinkObj( Title::makeTitle( NS_USER, $value ),
- htmlspecialchars( $value ) );
+ $link = $this->getSkin()->link(
+ Title::makeTitle( NS_USER, $value ),
+ htmlspecialchars( $value )
+ );
} else {
$link = htmlspecialchars( $value );
}
} else {
$link = htmlspecialchars( $value );
}
diff --git
a/includes/specials/SpecialListredirects.php
b/includes/specials/SpecialListredirects.php
index
9555bd1
..
bf59407
100644
(file)
--- a/
includes/specials/SpecialListredirects.php
+++ b/
includes/specials/SpecialListredirects.php
@@
-32,7
+32,12
@@
class ListredirectsPage extends QueryPage {
# Make a link to the redirect itself
$rd_title = Title::makeTitle( $result->namespace, $result->title );
# Make a link to the redirect itself
$rd_title = Title::makeTitle( $result->namespace, $result->title );
- $rd_link = $skin->makeLinkObj( $rd_title, '', 'redirect=no' );
+ $rd_link = $skin->link(
+ $rd_title,
+ null,
+ array(),
+ array( 'redirect' => 'no' )
+ );
# Find out where the redirect leads
$revision = Revision::newFromTitle( $rd_title );
# Find out where the redirect leads
$revision = Revision::newFromTitle( $rd_title );
@@
-41,7
+46,7
@@
class ListredirectsPage extends QueryPage {
$target = Title::newFromRedirect( $revision->getText() );
if( $target ) {
$arr = $wgContLang->getArrow() . $wgContLang->getDirMark();
$target = Title::newFromRedirect( $revision->getText() );
if( $target ) {
$arr = $wgContLang->getArrow() . $wgContLang->getDirMark();
- $targetLink = $skin->
makeLinkObj
( $target );
+ $targetLink = $skin->
link
( $target );
return "$rd_link $arr $targetLink";
} else {
return "<s>$rd_link</s>";
return "$rd_link $arr $targetLink";
} else {
return "<s>$rd_link</s>";
diff --git
a/includes/specials/SpecialListusers.php
b/includes/specials/SpecialListusers.php
index
fb8005d
..
eafc054
100644
(file)
--- a/
includes/specials/SpecialListusers.php
+++ b/
includes/specials/SpecialListusers.php
@@
-117,7
+117,7
@@
class UsersPager extends AlphabeticPager {
global $wgLang;
$userPage = Title::makeTitle( NS_USER, $row->user_name );
global $wgLang;
$userPage = Title::makeTitle( NS_USER, $row->user_name );
- $name = $this->getSkin()->
makeLinkObj
( $userPage, htmlspecialchars( $userPage->getText() ) );
+ $name = $this->getSkin()->
link
( $userPage, htmlspecialchars( $userPage->getText() ) );
if( $row->numgroups > 1 || ( $this->requestedGroup && $row->numgroups == 1 ) ) {
$list = array();
if( $row->numgroups > 1 || ( $this->requestedGroup && $row->numgroups == 1 ) ) {
$list = array();
diff --git
a/includes/specials/SpecialMIMEsearch.php
b/includes/specials/SpecialMIMEsearch.php
index
4672b0a
..
3bd89a9
100644
(file)
--- a/
includes/specials/SpecialMIMEsearch.php
+++ b/
includes/specials/SpecialMIMEsearch.php
@@
-72,7
+72,7
@@
class MIMEsearchPage extends QueryPage {
$wgLang->formatNum( $result->img_size ) );
$dimensions = wfMsgHtml( 'widthheight', $wgLang->formatNum( $result->img_width ),
$wgLang->formatNum( $result->img_height ) );
$wgLang->formatNum( $result->img_size ) );
$dimensions = wfMsgHtml( 'widthheight', $wgLang->formatNum( $result->img_width ),
$wgLang->formatNum( $result->img_height ) );
- $user = $skin->
makeLinkObj
( Title::makeTitle( NS_USER, $result->img_user_text ), $result->img_user_text );
+ $user = $skin->
link
( Title::makeTitle( NS_USER, $result->img_user_text ), $result->img_user_text );
$time = $wgLang->timeanddate( $result->img_timestamp );
return "($download) $plink . . $dimensions . . $bytes . . $user . . $time";
$time = $wgLang->timeanddate( $result->img_timestamp );
return "($download) $plink . . $dimensions . . $bytes . . $user . . $time";
diff --git
a/includes/specials/SpecialMostlinked.php
b/includes/specials/SpecialMostlinked.php
index
078489b
..
e63e250
100644
(file)
--- a/
includes/specials/SpecialMostlinked.php
+++ b/
includes/specials/SpecialMostlinked.php
@@
-75,7
+75,7
@@
class MostlinkedPage extends QueryPage {
function formatResult( $skin, $result ) {
global $wgLang;
$title = Title::makeTitleSafe( $result->namespace, $result->title );
function formatResult( $skin, $result ) {
global $wgLang;
$title = Title::makeTitleSafe( $result->namespace, $result->title );
- $link = $skin->
makeLinkObj
( $title );
+ $link = $skin->
link
( $title );
$wlh = $this->makeWlhLink( $title,
wfMsgExt( 'nlinks', array( 'parsemag', 'escape'),
$wgLang->formatNum( $result->value ) ), $skin );
$wlh = $this->makeWlhLink( $title,
wfMsgExt( 'nlinks', array( 'parsemag', 'escape'),
$wgLang->formatNum( $result->value ) ), $skin );
diff --git
a/includes/specials/SpecialMostlinkedcategories.php
b/includes/specials/SpecialMostlinkedcategories.php
index
ab25067
..
20a35c9
100644
(file)
--- a/
includes/specials/SpecialMostlinkedcategories.php
+++ b/
includes/specials/SpecialMostlinkedcategories.php
@@
-58,7
+58,7
@@
class MostlinkedCategoriesPage extends QueryPage {
$nt = Title::makeTitle( $result->namespace, $result->title );
$text = $wgContLang->convert( $nt->getText() );
$nt = Title::makeTitle( $result->namespace, $result->title );
$text = $wgContLang->convert( $nt->getText() );
- $plink = $skin->
makeLinkObj
( $nt, htmlspecialchars( $text ) );
+ $plink = $skin->
link
( $nt, htmlspecialchars( $text ) );
$nlinks = wfMsgExt( 'nmembers', array( 'parsemag', 'escape'),
$wgLang->formatNum( $result->value ) );
$nlinks = wfMsgExt( 'nmembers', array( 'parsemag', 'escape'),
$wgLang->formatNum( $result->value ) );
diff --git
a/includes/specials/SpecialMostlinkedtemplates.php
b/includes/specials/SpecialMostlinkedtemplates.php
index
2d398a3
..
76c1a09
100644
(file)
--- a/
includes/specials/SpecialMostlinkedtemplates.php
+++ b/
includes/specials/SpecialMostlinkedtemplates.php
@@
-95,7
+95,7
@@
class SpecialMostlinkedtemplates extends QueryPage {
$skin->link( $title );
return wfSpecialList(
$skin->link( $title );
return wfSpecialList(
- $skin->
makeLinkObj
( $title ),
+ $skin->
link
( $title ),
$this->makeWlhLink( $title, $skin, $result )
);
}
$this->makeWlhLink( $title, $skin, $result )
);
}
diff --git
a/includes/specials/SpecialMovepage.php
b/includes/specials/SpecialMovepage.php
index
8fcf33a
..
7974e2b
100644
(file)
--- a/
includes/specials/SpecialMovepage.php
+++ b/
includes/specials/SpecialMovepage.php
@@
-91,7
+91,7
@@
class MovePageForm {
$skin = $wgUser->getSkin();
$skin = $wgUser->getSkin();
- $oldTitleLink = $skin->
makeLinkObj
( $this->oldTitle );
+ $oldTitleLink = $skin->
link
( $this->oldTitle );
$wgOut->setPagetitle( wfMsg( 'move-page', $this->oldTitle->getPrefixedText() ) );
$wgOut->setSubtitle( wfMsg( 'move-page-backlink', $oldTitleLink ) );
$wgOut->setPagetitle( wfMsg( 'move-page', $this->oldTitle->getPrefixedText() ) );
$wgOut->setSubtitle( wfMsg( 'move-page-backlink', $oldTitleLink ) );
@@
-468,7
+468,7
@@
class MovePageForm {
$extraOutput []= wfMsgHtml( 'movepage-page-moved', $oldLink, $newLink );
} else {
$oldLink = $skin->makeKnownLinkObj( $oldSubpage );
$extraOutput []= wfMsgHtml( 'movepage-page-moved', $oldLink, $newLink );
} else {
$oldLink = $skin->makeKnownLinkObj( $oldSubpage );
- $newLink = $skin->
makeLinkObj
( $newSubpage );
+ $newLink = $skin->
link
( $newSubpage );
$extraOutput []= wfMsgHtml( 'movepage-page-unmoved', $oldLink, $newLink );
}
}
$extraOutput []= wfMsgHtml( 'movepage-page-unmoved', $oldLink, $newLink );
}
}
diff --git
a/includes/specials/SpecialNewimages.php
b/includes/specials/SpecialNewimages.php
index
575e37a
..
88e34f4
100644
(file)
--- a/
includes/specials/SpecialNewimages.php
+++ b/
includes/specials/SpecialNewimages.php
@@
-125,7
+125,7
@@
function wfSpecialNewimages( $par, $specialPage ) {
$ut = $s->img_user_text;
$nt = Title::newFromText( $name, NS_FILE );
$ut = $s->img_user_text;
$nt = Title::newFromText( $name, NS_FILE );
- $ul = $sk->
makeLinkObj
( Title::makeTitle( NS_USER, $ut ), $ut );
+ $ul = $sk->
link
( Title::makeTitle( NS_USER, $ut ), $ut );
$gallery->add( $nt, "$ul<br />\n<i>".$wgLang->timeanddate( $s->img_timestamp, true )."</i><br />\n" );
$gallery->add( $nt, "$ul<br />\n<i>".$wgLang->timeanddate( $s->img_timestamp, true )."</i><br />\n" );
diff --git
a/includes/specials/SpecialProtectedpages.php
b/includes/specials/SpecialProtectedpages.php
index
a38a8cd
..
aeb1d7b
100644
(file)
--- a/
includes/specials/SpecialProtectedpages.php
+++ b/
includes/specials/SpecialProtectedpages.php
@@
-65,7
+65,7
@@
class ProtectedPagesForm {
$skin = $wgUser->getSkin();
$title = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
$skin = $wgUser->getSkin();
$title = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
- $link = $skin->
makeLinkObj
( $title );
+ $link = $skin->
link
( $title );
$description_items = array ();
$description_items = array ();
diff --git
a/includes/specials/SpecialProtectedtitles.php
b/includes/specials/SpecialProtectedtitles.php
index
7e8126d
..
720b2f6
100644
(file)
--- a/
includes/specials/SpecialProtectedtitles.php
+++ b/
includes/specials/SpecialProtectedtitles.php
@@
-61,7
+61,7
@@
class ProtectedTitlesForm {
$skin = $wgUser->getSkin();
$title = Title::makeTitleSafe( $row->pt_namespace, $row->pt_title );
$skin = $wgUser->getSkin();
$title = Title::makeTitleSafe( $row->pt_namespace, $row->pt_title );
- $link = $skin->
makeLinkObj
( $title );
+ $link = $skin->
link
( $title );
$description_items = array ();
$description_items = array ();
diff --git
a/includes/specials/SpecialShortpages.php
b/includes/specials/SpecialShortpages.php
index
2e7d24a
..
70f5c30
100644
(file)
--- a/
includes/specials/SpecialShortpages.php
+++ b/
includes/specials/SpecialShortpages.php
@@
-76,7
+76,7
@@
class ShortPagesPage extends QueryPage {
}
$hlink = $skin->makeKnownLinkObj( $title, wfMsgHtml( 'hist' ), 'action=history' );
$plink = $this->isCached()
}
$hlink = $skin->makeKnownLinkObj( $title, wfMsgHtml( 'hist' ), 'action=history' );
$plink = $this->isCached()
- ? $skin->
makeLinkObj
( $title )
+ ? $skin->
link
( $title )
: $skin->makeKnownLinkObj( $title );
$size = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ), $wgLang->formatNum( htmlspecialchars( $result->value ) ) );
: $skin->makeKnownLinkObj( $title );
$size = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ), $wgLang->formatNum( htmlspecialchars( $result->value ) ) );
diff --git
a/includes/specials/SpecialUndelete.php
b/includes/specials/SpecialUndelete.php
index
da518e9
..
1c574be
100644
(file)
--- a/
includes/specials/SpecialUndelete.php
+++ b/
includes/specials/SpecialUndelete.php
@@
-866,14
+866,14
@@
class UndeleteForm {
if( $isDeleted ) {
/// @fixme $rev->getTitle() is null for deleted revs...?
$targetPage = SpecialPage::getTitleFor( 'Undelete' );
if( $isDeleted ) {
/// @fixme $rev->getTitle() is null for deleted revs...?
$targetPage = SpecialPage::getTitleFor( 'Undelete' );
- $targetQuery =
'target=' .
- $this->mTargetObj->getPrefixedUrl() .
- '
×tamp=' .
-
wfTimestamp( TS_MW, $rev->getTimestamp()
);
+ $targetQuery =
array(
+ 'target' => $this->mTargetObj->getPrefixedUrl(),
+ '
timestamp' => wfTimestamp( TS_MW, $rev->getTimestamp() )
+ );
} else {
/// @fixme getId() may return non-zero for deleted revs...
$targetPage = $rev->getTitle();
} else {
/// @fixme getId() may return non-zero for deleted revs...
$targetPage = $rev->getTitle();
- $targetQuery =
'oldid=' . $rev->getId(
);
+ $targetQuery =
array( 'oldid' => $rev->getId()
);
}
// Add show/hide link if available
if( $wgUser->isAllowed( 'deleterevision' ) ) {
}
// Add show/hide link if available
if( $wgUser->isAllowed( 'deleterevision' ) ) {
@@
-893,10
+893,15
@@
class UndeleteForm {
}
return
'<div id="mw-diff-'.$prefix.'title1"><strong>' .
}
return
'<div id="mw-diff-'.$prefix.'title1"><strong>' .
- $sk->makeLinkObj( $targetPage,
- wfMsgHtml( 'revisionasof',
- $wgLang->timeanddate( $rev->getTimestamp(), true ) ),
- $targetQuery ) .
+ $sk->link(
+ $targetPage,
+ wfMsgHtml(
+ 'revisionasof',
+ $wgLang->timeanddate( $rev->getTimestamp(), true )
+ ),
+ array(),
+ $targetQuery
+ ) .
( $isDeleted ? ' ' . wfMsgHtml( 'deletedrev' ) : '' ) .
'</strong></div>' .
'<div id="mw-diff-'.$prefix.'title2">' .
( $isDeleted ? ' ' . wfMsgHtml( 'deletedrev' ) : '' ) .
'</strong></div>' .
'<div id="mw-diff-'.$prefix.'title2">' .
diff --git
a/includes/specials/SpecialUnusedcategories.php
b/includes/specials/SpecialUnusedcategories.php
index
406f794
..
fe7d7a1
100644
(file)
--- a/
includes/specials/SpecialUnusedcategories.php
+++ b/
includes/specials/SpecialUnusedcategories.php
@@
-34,7
+34,7
@@
class UnusedCategoriesPage extends QueryPage {
function formatResult( $skin, $result ) {
$title = Title::makeTitle( NS_CATEGORY, $result->title );
function formatResult( $skin, $result ) {
$title = Title::makeTitle( NS_CATEGORY, $result->title );
- return $skin->
makeLinkObj
( $title, $title->getText() );
+ return $skin->
link
( $title, $title->getText() );
}
}
}
}
diff --git
a/includes/specials/SpecialWantedcategories.php
b/includes/specials/SpecialWantedcategories.php
index
9a28301
..
4d54c86
100644
(file)
--- a/
includes/specials/SpecialWantedcategories.php
+++ b/
includes/specials/SpecialWantedcategories.php
@@
-44,7
+44,7
@@
class WantedCategoriesPage extends WantedQueryPage {
$text = $wgContLang->convert( $nt->getText() );
$plink = $this->isCached() ?
$text = $wgContLang->convert( $nt->getText() );
$plink = $this->isCached() ?
- $skin->
makeLinkObj
( $nt, htmlspecialchars( $text ) ) :
+ $skin->
link
( $nt, htmlspecialchars( $text ) ) :
$skin->makeBrokenLinkObj( $nt, htmlspecialchars( $text ) );
$nlinks = wfMsgExt( 'nmembers', array( 'parsemag', 'escape'),
$skin->makeBrokenLinkObj( $nt, htmlspecialchars( $text ) );
$nlinks = wfMsgExt( 'nmembers', array( 'parsemag', 'escape'),