From: Fomafix <fomafix@googlemail.com>
Date: Tue, 30 Jul 2019 04:52:59 +0000 (+0200)
Subject: resourceloader: Avoid escaping of UTF-8 characters in messages
X-Git-Tag: 1.34.0-rc.0~819^2
X-Git-Url: http://git.cyclocoop.org/data/%24%7Bnav_urls/membership/href%7D?a=commitdiff_plain;h=39a6f3f174536eab28c2ae4485ac4f393fce7e93;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Avoid escaping of UTF-8 characters in messages

It's not needed to escape UTF-8 characters in messages.

The characters '&', '<' and '>' are still escaped. For the output in
load.php this escaping is not necessary but messages can also embedded
into <script> tags and here are the characters '<' and '>' problematic.

Bug: T229301
Change-Id: If424a21df4a813ba6cb79b939f0857d96f162a17
---

diff --git a/includes/resourceloader/MessageBlobStore.php b/includes/resourceloader/MessageBlobStore.php
index fca06c9160..d0f67294a7 100644
--- a/includes/resourceloader/MessageBlobStore.php
+++ b/includes/resourceloader/MessageBlobStore.php
@@ -224,7 +224,7 @@ class MessageBlobStore implements LoggerAwareInterface {
 			}
 		}
 
-		$json = FormatJson::encode( (object)$messages );
+		$json = FormatJson::encode( (object)$messages, false, FormatJson::UTF8_OK );
 		// @codeCoverageIgnoreStart
 		if ( $json === false ) {
 			$this->logger->warning( 'Failed to encode message blob for {module} ({lang})', [