From: Huji Lee <huji.huji@gmail.com>
Date: Sun, 27 Nov 2016 04:44:44 +0000 (-0500)
Subject: "Image size limit" text should always read left-to-right
X-Git-Tag: 1.31.0-rc.0~4602^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=2783d7df32892529244b706d71412963aa9a9342;p=lhc%2Fweb%2Fwiklou.git

"Image size limit" text should always read left-to-right

Bug: T144386
Change-Id: I10ab5ed71c114bbfefcc841d8a3d4b280bf1acf2
---

diff --git a/includes/Preferences.php b/includes/Preferences.php
index d40e0c1323..cf8e7b8088 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1218,7 +1218,8 @@ class Preferences {
 		$pixels = $context->msg( 'unit-pixel' )->text();
 
 		foreach ( $context->getConfig()->get( 'ImageLimits' ) as $index => $limits ) {
-			$display = "{$limits[0]}×{$limits[1]}" . $pixels;
+			// Note: A left-to-right marker (\u200e) is inserted, see T144386
+			$display = "{$limits[0]}" . json_decode( '"\u200e"' ) . "×{$limits[1]}" . $pixels;
 			$ret[$display] = $index;
 		}