jenkins-bot has submitted this change and it was merged.
Change subject: Consistently use TemplateHelper::html
......................................................................
Consistently use TemplateHelper::html
Use the same pattern for bypassing autoescape in all
helper methods to increase searchability.
Change-Id: I6644d1d1a20a95b494407a85925885f808284e41
---
M includes/TemplateHelper.php
1 file changed, 8 insertions(+), 11 deletions(-)
Approvals:
SG: Looks good to me, approved
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/TemplateHelper.php b/includes/TemplateHelper.php
index 06203fc..ee735b3 100644
--- a/includes/TemplateHelper.php
+++ b/includes/TemplateHelper.php
@@ -581,7 +581,7 @@
static public function l10nParse( $str /*, $args... */ ) {
$args = func_get_args();
array_shift( $args );
- return array( wfMessage( $str, $args )->parse(), 'raw' );
+ return self::html( wfMessage( $str, $args )->parse() );
}
/**
@@ -606,16 +606,13 @@
}
$differenceEngine->showDiffStyle();
- return array(
- $differenceEngine->addHeader(
- $diffContent,
- self::generateDiffViewTitle( $oldTimestamp,
$oldAuthor, $oldLink ),
- self::generateDiffViewTitle( $newTimestamp,
$newAuthor, $newLink ),
- $multi,
- $notice
- ),
- 'raw'
- );
+ return self::html( $differenceEngine->addHeader(
+ $diffContent,
+ self::generateDiffViewTitle( $oldTimestamp, $oldAuthor,
$oldLink ),
+ self::generateDiffViewTitle( $newTimestamp, $newAuthor,
$newLink ),
+ $multi,
+ $notice
+ ) );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/142200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6644d1d1a20a95b494407a85925885f808284e41
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: frontend-rewrite
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: EBernhardson <[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
