[MediaWiki-commits] [Gerrit] mediawiki...Duplicator[master]: Fixed specialpage messages not getting rendered correctly

2017-11-16 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379493 )

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
---
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(),

[MediaWiki-commits] [Gerrit] mediawiki...Duplicator[master]: Fixed specialpage messages not getting rendered correctly

2017-09-21 Thread Pwirth (Code Review) 
Pwirth has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379493 )

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
---
M Duplicator.page.php
1 file changed, 11 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Duplicator 
refs/changes/93/379493/1

diff --git a/Duplicator.page.php b/Duplicator.page.php
index d41bce0..0f4d3ee 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() );
}
}
 
@@ -260,7 +260,7 @@
$this->msg( 
'duplicator-failed-dest-exists',
$sub->getPrefixedText(),

$destSub->getPrefixedText()
-   )->plain()
+   )->text()
);
} else {
$num = $this->duplicate( $sub, 
$destSub, $this->history );
@@ -269,15 +269,15 @@
$this->msg( 
'duplicator-success',
$sub->getPrefixedText(),

$destSub->getPrefixedText()
-   )->plain() . ' ' .
+   )->text() . ' ' .
$this->msg( 
'duplicator-success-revisions',
$wgLang->formatNum( 
$num )
-   )->plain()
+   )->text()
);
}
} else {