From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Fri, 21 Aug 2015 13:54:38 +0000 (-0400)
Subject: Provide fallbacks for use of mb_convert_encoding() in HtmlFormatter
X-Git-Tag: 1.31.0-rc.0~10076^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=21ae7bdb3a48be60f1ce75979ccd31111c256af3;p=lhc%2Fweb%2Fwiklou.git

Provide fallbacks for use of mb_convert_encoding() in HtmlFormatter

Since we don't strictly require mbstring in core, provide fallbacks for
the use of mb_convert_encoding() to go to/from 'HTML-ENTITIES' in
HtmlFormatter.

Bug: T62174
Change-Id: I2dcde96e0e68a7d141f2ba79558b20e1d9c799ec
---

diff --git a/includes/HtmlFormatter.php b/includes/HtmlFormatter.php
index b2926d17bc..221cefbb3a 100644
--- a/includes/HtmlFormatter.php
+++ b/includes/HtmlFormatter.php
@@ -63,7 +63,15 @@ class HtmlFormatter {
 	 */
 	public function getDoc() {
 		if ( !$this->doc ) {
-			$html = mb_convert_encoding( $this->html, 'HTML-ENTITIES', 'UTF-8' );
+			// DOMDocument::loadHTML apparently isn't very good with encodings, so
+			// convert input to ASCII by encoding everything above 128 as entities.
+			if ( function_exists( 'mb_convert_encoding' ) ) {
+				$html = mb_convert_encoding( $this->html, 'HTML-ENTITIES', 'UTF-8' );
+			} else {
+				$html = preg_replace_callback( '/[\x{80}-\x{10ffff}]/u', function ( $m ) {
+					return '&#' . UtfNormal\Utils::utf8ToCodepoint( $m[0] ) . ';';
+				}, $this->html );
+			}
 
 			// Workaround for bug that caused spaces before references
 			// to disappear during processing:
@@ -244,7 +252,14 @@ class HtmlFormatter {
 			) );
 		}
 		$html = $replacements->replace( $html );
-		$html = mb_convert_encoding( $html, 'UTF-8', 'HTML-ENTITIES' );
+
+		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' );
+		}
 		return $html;
 	}