jenkins-bot has submitted this change and it was merged.
Change subject: Fixes to last commit, based on comments from Nikerabbit
......................................................................
Fixes to last commit, based on comments from Nikerabbit
Change-Id: Idd011293cf141c972e980801c7c0628ce7ba034c
---
M ApprovedRevs.hooks.php
M SpecialApprovedRevs.php
2 files changed, 23 insertions(+), 22 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApprovedRevs.hooks.php b/ApprovedRevs.hooks.php
index 9001201..2091e81 100644
--- a/ApprovedRevs.hooks.php
+++ b/ApprovedRevs.hooks.php
@@ -268,7 +268,7 @@
$text = Xml::element(
'span',
array( 'class' => 'approvedAndLatestMsg' ),
- wfMessage( 'approvedrevs-approvedandlatest'
)->parse()
+ wfMessage( 'approvedrevs-approvedandlatest'
)->text()
);
} else {
$text = wfMessage( 'approvedrevs-notlatest' )->parse();
@@ -314,8 +314,9 @@
$latestRevID = $title->getLatestRevID();
if ( ! empty( $approvedRevID ) && $approvedRevID !=
$latestRevID ) {
ApprovedRevs::addCSS();
- global $wgOut;
- $wgOut->addHTML( '<p class="approvedRevsEditWarning">'
. wfMessage( 'approvedrevs-editwarning' )->parse() . "</p>\n" );
+ // A lengthy way to avoid not calling $wgOut...
+ // hopefully this is better!
+
$editPage->getArticle()->getContext()->getOutput()->wrapWikiMsg( "<p
class=\"approvedRevsEditWarning\">$1</p>\n", 'approvedrevs-editwarning' );
}
return true;
}
@@ -335,7 +336,7 @@
ApprovedRevs::addCSS();
$preFormHTML .= Xml::element ( 'p',
array( 'style' => 'font-weight: bold' ),
- wfMessage( 'approvedrevs-editwarning'
)->parse() ) . "\n";
+ wfMessage( 'approvedrevs-editwarning' )->text()
) . "\n";
}
return true;
}
@@ -421,12 +422,12 @@
$url = $title->getLocalUrl(
array( 'action' => 'unapprove' )
);
- $msg = wfMessage( 'approvedrevs-unapprove'
)->parse();
+ $msg = wfMessage( 'approvedrevs-unapprove'
)->text();
} else {
$url = $title->getLocalUrl(
array( 'action' => 'approve', 'oldid'
=> $row->rev_id )
);
- $msg = wfMessage( 'approvedrevs-approve'
)->parse();
+ $msg = wfMessage( 'approvedrevs-approve'
)->text();
}
$s .= ' (' . Xml::element(
'a',
@@ -466,7 +467,7 @@
$wgOut->addHTML( "\t\t" . Xml::element(
'div',
array( 'class' => 'successbox' ),
- wfMessage( 'approvedrevs-approvesuccess' )->parse()
+ wfMessage( 'approvedrevs-approvesuccess' )->text()
) . "\n" );
$wgOut->addHTML( "\t\t" . Xml::element(
'p',
@@ -508,9 +509,9 @@
// a blank right now or not
global $egApprovedRevsBlankIfUnapproved;
if ( $egApprovedRevsBlankIfUnapproved ) {
- $successMsg = wfMessage(
'approvedrevs-unapprovesuccess2' )->parse();
+ $successMsg = wfMessage(
'approvedrevs-unapprovesuccess2' )->text();
} else {
- $successMsg = wfMessage(
'approvedrevs-unapprovesuccess' )->parse();
+ $successMsg = wfMessage(
'approvedrevs-unapprovesuccess' )->text();
}
global $wgOut;
@@ -577,7 +578,7 @@
* 'Special:AdminLinks', defined by the Admin Links extension.
*/
static function addToAdminLinks( &$admin_links_tree ) {
- $general_section = $admin_links_tree->getSection( wfMessage(
'adminlinks_general' )->parse() );
+ $general_section = $admin_links_tree->getSection( wfMessage(
'adminlinks_general' )->text() );
$extensions_row = $general_section->getRow( 'extensions' );
if ( is_null( $extensions_row ) ) {
$extensions_row = new ALRow( 'extensions' );
@@ -670,19 +671,19 @@
'oldid' =>
$wgRequest->getInt( 'oldid' )
)
) ),
- wfMessage(
'approvedrevs-approvethisrev' )->parse()
+ wfMessage(
'approvedrevs-approvethisrev' )->text()
) ) );
}
} else {
$wgOut->appendSubtitle(
- htmlspecialchars( wfMessage(
'approvedrevs-blankpageshown' )->parse() ) . ' ' .
+ htmlspecialchars( wfMessage(
'approvedrevs-blankpageshown' )->text() ) . ' ' .
Xml::element( 'a',
array( 'href' => $title->getLocalUrl(
array(
'oldid' =>
$article->getRevIdFetched()
)
) ),
- wfMessage( 'approvedrevs-viewlatestrev'
)->parse()
+ wfMessage( 'approvedrevs-viewlatestrev'
)->text()
)
);
}
diff --git a/SpecialApprovedRevs.php b/SpecialApprovedRevs.php
index 2d68226..4d1b15d 100644
--- a/SpecialApprovedRevs.php
+++ b/SpecialApprovedRevs.php
@@ -62,12 +62,12 @@
if ( $this->mMode == '' ) {
$navLine .= Xml::element( 'strong',
null,
- wfMessage( 'approvedrevs-approvedpages'
)->parse()
+ wfMessage( 'approvedrevs-approvedpages'
)->text()
);
} else {
$navLine .= Xml::element( 'a',
array( 'href' =>
$approvedPagesTitle->getLocalURL() ),
- wfMessage( 'approvedrevs-approvedpages'
)->parse()
+ wfMessage( 'approvedrevs-approvedpages'
)->text()
);
}
@@ -76,12 +76,12 @@
if ( $this->mMode == 'notlatest' ) {
$navLine .= Xml::element( 'strong',
null,
- wfMessage( 'approvedrevs-notlatestpages'
)->parse()
+ wfMessage( 'approvedrevs-notlatestpages'
)->text()
);
} else {
$navLine .= Xml::element( 'a',
array( 'href' =>
$approvedPagesTitle->getLocalURL( array( 'show' => 'notlatest' ) ) ),
- wfMessage( 'approvedrevs-notlatestpages'
)->parse()
+ wfMessage( 'approvedrevs-notlatestpages'
)->text()
);
}
@@ -90,12 +90,12 @@
if ( $this->mMode == 'unapproved' ) {
$navLine .= Xml::element( 'strong',
null,
- wfMessage( 'approvedrevs-unapprovedpages'
)->parse()
+ wfMessage( 'approvedrevs-unapprovedpages'
)->text()
);
} else {
$navLine .= Xml::element( 'a',
array( 'href' =>
$approvedPagesTitle->getLocalURL( array( 'show' => 'unapproved' ) ) ),
- wfMessage( 'approvedrevs-unapprovedpages'
)->parse()
+ wfMessage( 'approvedrevs-unapprovedpages'
)->text()
);
}
@@ -231,7 +231,7 @@
'oldid' =>
$result->latest_id
)
) ),
- wfMessage( 'approvedrevs-approvelatest'
)->parse()
+ wfMessage( 'approvedrevs-approvelatest'
)->text()
) . ')';
}
@@ -244,7 +244,7 @@
'oldid' => $result->rev_id
)
) ),
- wfMessage( 'approvedrevs-difffromlatest'
)->parse()
+ wfMessage( 'approvedrevs-difffromlatest'
)->text()
);
return "$pageLink ($diffLink)";
@@ -255,7 +255,7 @@
array (
'class' => $result->rev_id ==
$result->latest_id ? 'approvedRevIsLatest' : 'approvedRevNotLatest'
),
- wfMessage( 'approvedrevs-revisionnumber',
$result->rev_id )->parse()
+ wfMessage( 'approvedrevs-revisionnumber',
$result->rev_id )->text()
);
// Get data on the most recent approval from the
--
To view, visit https://gerrit.wikimedia.org/r/115180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd011293cf141c972e980801c7c0628ce7ba034c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApprovedRevs
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
