jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392048 )
Change subject: Fixed specialpage messages not getting rendered correctly
......................................................................
Fixed specialpage messages not getting rendered correctly
=> Needs cherry-picks to REL1_30, REL1_29, REL1_28, REL1_27
Change-Id: Icc8a7db7c3ed2106dd6bf0abba03f8300db9c555
(cherry picked from commit 155892b7b6945c1e76d00434a73de0f75f191ac8)
---
M Duplicator.page.php
1 file changed, 13 insertions(+), 13 deletions(-)
Approvals:
Mglaser: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Duplicator.page.php b/Duplicator.page.php
index d41bce0..56c290b 100644
--- a/Duplicator.page.php
+++ b/Duplicator.page.php
@@ -116,13 +116,13 @@
$num = $this->duplicate( $this->sourceTitle, $this->destTitle,
$this->history );
if( $num ) {
$success = Html::openElement( 'ul' ) .
- Html::element( 'li',
+ Html::rawElement( 'li',
array(),
$this->msg( 'duplicator-success',
$this->sourceTitle->getPrefixedText(),
$this->destTitle->getPrefixedText()
- )->plain() . ' ' .
- $this->msg(
'duplicator-success-revisions' )->numParams( $num )->plain()
+ )->parse() . ' ' .
+ $this->msg(
'duplicator-success-revisions' )->numParams( $num )->text()
);
# If there are subpages and we've been asked to
duplicate them, do so
@@ -135,20 +135,20 @@
$dt = $this->destTitle->getTalkPage();
$num = $this->duplicate( $st, $dt,
$this->history );
if ( $num ) {
- $success .= Html::element( 'li',
+ $success .= Html::rawElement( 'li',
array(),
$this->msg(
'duplicator-success',
$st->getPrefixedText(),
$dt->getPrefixedText()
- )->plain() . ' ' .
- $this->msg(
'duplicator-success-revisions' )->numParams( $num )->plain()
+ )->parse() . ' ' .
+ $this->msg(
'duplicator-success-revisions' )->numParams( $num )->text()
);
if ( $this->subpages ) {
$success .=
$this->duplicateSubpages( $st, $dt, $this->history );
}
} else {
- $success .= Html::element( 'li',
array(), $this->msg( 'duplicator-success-talknotcopied' )->plain() );
+ $success .= Html::rawElement( 'li',
array(), $this->msg( 'duplicator-success-talknotcopied' )->text() );
}
}
@@ -255,29 +255,29 @@
$destSub = Title::makeTitleSafe( $ns, $dest . substr(
$sub->getText(), $len ) );
if ( $destSub ) {
if ( $destSub->exists() ) {
- $success .= Html::element( 'li',
+ $success .= Html::rawElement( 'li',
array(),
$this->msg(
'duplicator-failed-dest-exists',
$sub->getPrefixedText(),
$destSub->getPrefixedText()
- )->plain()
+ )->parse()
);
} else {
$num = $this->duplicate( $sub,
$destSub, $this->history );
- $success .= Html::element( 'li',
+ $success .= Html::rawElement( 'li',
array(),
$this->msg(
'duplicator-success',
$sub->getPrefixedText(),
$destSub->getPrefixedText()
- )->plain() . ' ' .
+ )->parse() . ' ' .
$this->msg(
'duplicator-success-revisions',
$wgLang->formatNum(
$num )
- )->plain()
+ )->text()
);
}
} else {
# Bad title error can only occur here because
of the destination title being too long
- $success .= Html::element( 'li', array(),
$this->msg( 'duplicator-failed-toolong', $sub->getPrefixedText() )->plain() );
+ $success .= Html::rawElement( 'li', array(),
$this->msg( 'duplicator-failed-toolong', $sub->getPrefixedText() )->text() );
}
}
return $success;
--
To view, visit https://gerrit.wikimedia.org/r/392048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc8a7db7c3ed2106dd6bf0abba03f8300db9c555
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Duplicator
Gerrit-Branch: REL1_27
Gerrit-Owner: Mglaser <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pwirth <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
