Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/305938
Change subject: Revert "Replace deprecated Linker::link() with
MediaWiki\Linker\LinkRenderer"
......................................................................
Revert "Replace deprecated Linker::link() with MediaWiki\Linker\LinkRenderer"
This reverts commit e603cddea66fa609fd21000bd4f3eee8e2bf2f3c.
This broke confirmaccount.
Change-Id: I7642d04d741627c9a88178e44151c7da189749a5
---
M frontend/specialpages/actions/ConfirmAccount_body.php
M frontend/specialpages/actions/RequestAccount_body.php
M frontend/specialpages/actions/UserCredentials_body.php
3 files changed, 7 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmAccount
refs/changes/38/305938/1
diff --git a/frontend/specialpages/actions/ConfirmAccount_body.php
b/frontend/specialpages/actions/ConfirmAccount_body.php
index 51d3589..e1c14f1 100644
--- a/frontend/specialpages/actions/ConfirmAccount_body.php
+++ b/frontend/specialpages/actions/ConfirmAccount_body.php
@@ -127,11 +127,10 @@
} else {
$listLink = $this->msg( 'confirmaccount-showopen'
)->escaped();
}
- $linkRenderer = $this->getLinkRenderer();
if ( $this->acrID || !$this->showHeld ) {
$listLink = $this->getLanguage()->pipeList( [
$listLink,
- $linkRenderer->makeKnownLink(
+ Linker::linkKnown(
$titleObj,
$this->msg( 'confirmaccount-showheld'
)->escaped(),
[],
@@ -147,7 +146,7 @@
if ( $this->acrID || !$this->showRejects ) {
$listLink = $this->getLanguage()->pipeList( [
$listLink,
- $linkRenderer->makeKnownLink(
+ Linker::linkKnown(
$titleObj,
$this->msg( 'confirmaccount-showrej'
)->escaped(),
[],
@@ -163,7 +162,7 @@
if ( $this->acrID || !$this->showStale ) {
$listLink = $this->getLanguage()->pipeList( [
$listLink,
- $linkRenderer->makeKnownLink(
+ Linker::linkKnown(
$titleObj,
$this->msg( 'confirmaccount-showexp'
)->escaped(),
[],
diff --git a/frontend/specialpages/actions/RequestAccount_body.php
b/frontend/specialpages/actions/RequestAccount_body.php
index ecd4a43..f9388ac 100755
--- a/frontend/specialpages/actions/RequestAccount_body.php
+++ b/frontend/specialpages/actions/RequestAccount_body.php
@@ -166,8 +166,7 @@
}
$formName = "wpArea-" . htmlspecialchars(
str_replace( ' ', '_', $name ) );
if ( $conf['project'] != '' ) {
- $linkRenderer =
$this->getLinkRenderer();
- $pg = $linkRenderer->makeLink(
Title::newFromText( $conf['project'] ),
+ $pg = Linker::link( Title::newFromText(
$conf['project'] ),
$this->msg(
'requestaccount-info' )->escaped(), [], [], "known" );
} else {
$pg = '';
diff --git a/frontend/specialpages/actions/UserCredentials_body.php
b/frontend/specialpages/actions/UserCredentials_body.php
index 6967c1c..62f9133 100644
--- a/frontend/specialpages/actions/UserCredentials_body.php
+++ b/frontend/specialpages/actions/UserCredentials_body.php
@@ -94,8 +94,7 @@
$form .= '<legend>' . $this->msg( 'usercredentials-leg-user'
)->escaped() . '</legend>';
$form .= '<table style="padding:4px;">';
$form .= "<tr><td>" . $this->msg( 'username' )->escaped() .
"</td>";
- $linkRenderer = $this->getLinkRenderer();
- $form .= "<td>" . $linkRenderer->makeLink( $user->getUserPage(),
+ $form .= "<td>" . Linker::link( $user->getUserPage(),
htmlspecialchars( $user->getUserPage()->getText() ) ) .
"</td></tr>\n";
$econf = $row->acd_email_authenticated ? ' <strong>' .
$this->msg(
@@ -129,8 +128,7 @@
}
$formName = "wpArea-" . htmlspecialchars(
str_replace( ' ', '_', $name ) );
if ( $conf['project'] != '' ) {
- $linkRenderer =
$this->getLinkRenderer();
- $pg = $linkRenderer->makeKnownLink(
+ $pg = Linker::linkKnown(
Title::newFromText( $name ),
$this->msg(
'requestaccount-info' )->escaped()
);
@@ -163,8 +161,7 @@
if ( $this->hasItem( 'CV' ) || $this->hasItem( 'Notes' ) ||
$this->hasItem( 'Links' ) ) {
$form .= '<p>' . $this->msg( 'usercredentials-attach'
)->escaped() . ' ';
if ( $row->acd_filename ) {
- $linkRenderer = $this->getLinkRenderer();
- $form .= $linkRenderer->makeKnownLink(
+ $form .= Linker::linkKnown(
$titleObj,
htmlspecialchars( $row->acd_filename ),
[],
--
To view, visit https://gerrit.wikimedia.org/r/305938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7642d04d741627c9a88178e44151c7da189749a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmAccount
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits