jenkins-bot has submitted this change and it was merged.
Change subject: Replace deprecated hook Linker::makeKnownLinkObj with
Linker::linkKnown
......................................................................
Replace deprecated hook Linker::makeKnownLinkObj with Linker::linkKnown
Bug: T121145
Change-Id: I874edf03e18a0429e83e54f300377136703132dd
---
M frontend/specialpages/actions/ConfirmAccount_body.php
M frontend/specialpages/actions/UserCredentials_body.php
2 files changed, 37 insertions(+), 16 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/frontend/specialpages/actions/ConfirmAccount_body.php
b/frontend/specialpages/actions/ConfirmAccount_body.php
index 3e0027e..eb20bbd 100644
--- a/frontend/specialpages/actions/ConfirmAccount_body.php
+++ b/frontend/specialpages/actions/ConfirmAccount_body.php
@@ -126,9 +126,10 @@
if ( $this->acrID || !$this->showHeld ) {
$listLink = $this->getLanguage()->pipeList( array(
$listLink,
- Linker::makeKnownLinkObj(
+ Linker::linkKnown(
$titleObj,
$this->msg( 'confirmaccount-showheld'
)->escaped(),
+ array(),
'wpShowHeld=1'
)
) );
@@ -141,8 +142,10 @@
if ( $this->acrID || !$this->showRejects ) {
$listLink = $this->getLanguage()->pipeList( array(
$listLink,
- Linker::makeKnownLinkObj( $titleObj,
+ Linker::linkKnown(
+ $titleObj,
$this->msg( 'confirmaccount-showrej'
)->escaped(),
+ array(),
'wpShowRejects=1'
)
) );
@@ -155,8 +158,10 @@
if ( $this->acrID || !$this->showStale ) {
$listLink = $this->getLanguage()->pipeList( array(
$listLink,
- Linker::makeKnownLinkObj( $titleObj,
+ Linker::linkKnown(
+ $titleObj,
$this->msg( 'confirmaccount-showexp'
)->escaped(),
+ array(),
'wpShowStale=1'
)
) );
@@ -169,8 +174,10 @@
# Say what queue we are in...
if ( $this->queueType != -1 ) {
- $viewall = Linker::makeKnownLinkObj(
- $this->getPageTitle(), $this->msg(
'confirmaccount-all' )->escaped() );
+ $viewall = Linker::linkKnown(
+ $this->getPageTitle(),
+ $this->msg( 'confirmaccount-all' )->escaped()
+ );
// Give grep a chance to find the usages:
confirmaccount-type-0, confirmaccount-type-1
$this->getOutput()->setSubtitle(
@@ -195,31 +202,35 @@
$counts = ConfirmAccount::getOpenRequestCount( $i );
$open = '<b>';
- $open .= Linker::makeKnownLinkObj(
+ $open .= Linker::linkKnown(
$titleObj,
$this->msg( 'confirmaccount-q-open'
)->escaped(),
+ array(),
'wpShowHeld=0'
);
$open .= '</b> [' . $counts['open'] . ']';
- $held = Linker::makeKnownLinkObj(
+ $held = Linker::linkKnown(
$titleObj,
$this->msg( 'confirmaccount-q-held'
)->escaped(),
+ array(),
'wpShowHeld=1'
);
$held .= ' [' . $counts['held'] . ']';
- $rejects = Linker::makeKnownLinkObj(
+ $rejects = Linker::linkKnown(
$titleObj,
$this->msg( 'confirmaccount-q-rej' )->escaped(),
+ array(),
'wpShowRejects=1'
);
$rejects .= ' [' . $counts['rejected'] . ']';
$stale = '<i>';
- $stale .= Linker::makeKnownLinkObj(
+ $stale .= Linker::linkKnown(
$titleObj,
$this->msg( 'confirmaccount-q-stale'
)->escaped(),
+ array(),
'wpShowStale=1'
);
$stale .= '</i>';
@@ -385,9 +396,12 @@
if ( $this->hasItem( 'CV' ) ) {
$form .= '<p>' . $this->msg(
'confirmaccount-attach' )->escaped() . ' ';
if ( $accountReq->getFileName() !== null ) {
- $form .= Linker::makeKnownLinkObj(
$titleObj,
+ $form .= Linker::linkKnown(
+ $titleObj,
htmlspecialchars(
$accountReq->getFileName() ),
- 'file=' .
$accountReq->getFileStorageKey() );
+ array(),
+ 'file=' .
$accountReq->getFileStorageKey()
+ );
} else {
$form .= $this->msg(
'confirmaccount-none-p' )->escaped();
}
@@ -408,9 +422,10 @@
if ( $reqUser->isAllowed( 'requestips' ) ) {
$blokip = SpecialPage::getTitleFor( 'Block' );
- $link = Linker::makeKnownLinkObj(
+ $link = Linker::linkKnown(
$blokip,
$this->msg( 'confirmaccount-blockip'
)->escaped(),
+ array(),
'ip=' . $accountReq->getIP() .
'&wpCreateAccount=1'
);
$form .= '<fieldset>';
@@ -712,14 +727,16 @@
global $wgMemc;
if ( $this->showRejects || $this->showStale ) {
- $link = Linker::makeKnownLinkObj(
+ $link = Linker::linkKnown(
$this->getFullTitle(),
$this->msg( 'confirmaccount-review'
)->escaped(),
+ array(),
'acrid=' . (int)$row->acr_id .
'&wpShowRejects=1' );
} else {
- $link = Linker::makeKnownLinkObj(
+ $link = Linker::linkKnown(
$this->getFullTitle(),
$this->msg( 'confirmaccount-review'
)->escaped(),
+ array(),
'acrid=' . (int)$row->acr_id );
}
$time = $this->getLanguage()->timeanddate( wfTimestamp( TS_MW,
$row->acr_registration ), true );
diff --git a/frontend/specialpages/actions/UserCredentials_body.php
b/frontend/specialpages/actions/UserCredentials_body.php
index 4685729..1b7151e 100644
--- a/frontend/specialpages/actions/UserCredentials_body.php
+++ b/frontend/specialpages/actions/UserCredentials_body.php
@@ -161,8 +161,12 @@
if ( $this->hasItem( 'CV' ) || $this->hasItem( 'Notes' ) ||
$this->hasItem( 'Links' ) ) {
$form .= '<p>' . $this->msg( 'usercredentials-attach'
)->escaped() . ' ';
if ( $row->acd_filename ) {
- $form .= Linker::makeKnownLinkObj( $titleObj,
htmlspecialchars( $row->acd_filename ),
- 'file=' . $row->acd_storage_key );
+ $form .= Linker::linkKnown(
+ $titleObj,
+ htmlspecialchars( $row->acd_filename ),
+ array(),
+ 'file=' . $row->acd_storage_key
+ );
} else {
$form .= $this->msg( 'confirmaccount-none-p'
)->escaped();
}
--
To view, visit https://gerrit.wikimedia.org/r/258219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I874edf03e18a0429e83e54f300377136703132dd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ConfirmAccount
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
