From: Niklas Laxström <niklas.laxstrom@gmail.com>
Date: Tue, 16 Feb 2016 14:02:03 +0000 (+0100)
Subject: Allow &shy; in messages
X-Git-Tag: 1.31.0-rc.0~7934
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=5b33f0fca1f2853d6dab8f52a4ef9c700ab189c1;p=lhc%2Fweb%2Fwiklou.git

Allow &shy; in messages

Bug: T127062
Change-Id: I8b89d8fd6f688a2fa60f3bd92e4cea6909ed267f
---

diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 97552a7bee..b058d1f818 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -790,11 +790,13 @@ class MessageCache {
 					# Fix for NBSP, converted to space by firefox
 					'&nbsp;',
 					'&#160;',
+					'&shy;'
 				],
 				[
 					' ',
 					"\xc2\xa0",
-					"\xc2\xa0"
+					"\xc2\xa0",
+					"\xc2\xad"
 				],
 				$message
 			);