jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402915 )
Change subject: Remove superfuluous mbstring check
......................................................................
Remove superfuluous mbstring check
mbstring is required by both MediaWiki and HtmlFormatter
and is used without a check elsewhere in the same file.
Change-Id: Ie9547e9444f4a5638bd3cc17a0dd61b4987e6ee6
---
M src/HtmlFormatter.php
1 file changed, 3 insertions(+), 7 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/HtmlFormatter.php b/src/HtmlFormatter.php
index 1e64564..b4c4f83 100644
--- a/src/HtmlFormatter.php
+++ b/src/HtmlFormatter.php
@@ -244,13 +244,9 @@
];
$html = strtr( $html, $replacements );
- if ( \function_exists( 'mb_convert_encoding' ) ) {
- // Just in case the conversion in getDoc() above used
named
- // entities that aren't known to html_entity_decode().
- $html = \mb_convert_encoding( $html, 'UTF-8',
'HTML-ENTITIES' );
- } else {
- $html = \html_entity_decode( $html, ENT_COMPAT, 'utf-8'
);
- }
+ // Just in case the conversion in getDoc() above used named
+ // entities that aren't known to html_entity_decode().
+ $html = \mb_convert_encoding( $html, 'UTF-8', 'HTML-ENTITIES' );
return $html;
}
--
To view, visit https://gerrit.wikimedia.org/r/402915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9547e9444f4a5638bd3cc17a0dd61b4987e6ee6
Gerrit-PatchSet: 1
Gerrit-Project: HtmlFormatter
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
