jenkins-bot has submitted this change and it was merged.
Change subject: Use msg() from context rather than wfMessage
......................................................................
Use msg() from context rather than wfMessage
No need to override language; content language would not be correct
here.
Change-Id: I18f583d201b61bc734a27ba558ff3d8612a87a34
---
M includes/Log/ActionFormatter.php
1 file changed, 2 insertions(+), 6 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Log/ActionFormatter.php b/includes/Log/ActionFormatter.php
index 4ed8982..a20e3b3 100644
--- a/includes/Log/ActionFormatter.php
+++ b/includes/Log/ActionFormatter.php
@@ -38,8 +38,6 @@
* @return string The log entry
*/
protected function getActionMessage() {
- global $wgContLang;
-
/*
* At this point, all log entries will already have been
created & we've
* gathered all uuids in constructor: we can now batch-load all
of them.
@@ -69,7 +67,6 @@
$type = $this->entry->getType();
$action = $this->entry->getSubtype();
$title = $this->entry->getTarget();
- $skin = $this->plaintext ? null : $this->context->getSkin();
$params = $this->entry->getParameters();
// @todo: we should probably check if user isAllowed(
<this-revision>, 'log' )
@@ -94,8 +91,7 @@
// logentry-suppress-flow-restore-post,
logentry-suppress-flow-suppress-post,
// logentry-delete-flow-delete-topic,
logentry-delete-flow-restore-topic,
// logentry-suppress-flow-restore-topic,
logentry-suppress-flow-suppress-topic,
- $language = $skin === null ? $wgContLang : $skin->getLanguage();
- $message = wfMessage( "logentry-$type-$action" )
+ $message = $this->msg( "logentry-$type-$action" )
->params( array(
Message::rawParam( $this->getPerformerElement()
),
$this->entry->getPerformer()->getName(),
@@ -109,7 +105,7 @@
$message->params( $root->getWorkflow()->getOwnerTitle() ); //
board title object
- $message->inLanguage( $language )->parse();
+ $message->parse();
return \Html::rawElement(
'span',
--
To view, visit https://gerrit.wikimedia.org/r/190415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I18f583d201b61bc734a27ba558ff3d8612a87a34
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: SG <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
