From: Kevin Israel <pleasestand@live.com>
Date: Fri, 25 Apr 2014 19:00:40 +0000 (-0400)
Subject: FormatJson: Remove speculative comment
X-Git-Tag: 1.31.0-rc.0~16007^2
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=b9a12b0b33a25d643d2806d0bad1d3bafb62d139;p=lhc%2Fweb%2Fwiklou.git

FormatJson: Remove speculative comment

Follows-up bec7e8287c69. The comment "Can be removed once we require
PHP >= 5.4.28, 5.5.12, 5.6.0" relies on some assumptions that might
later prove to be incorrect:

* That the fix won't be reverted from any of those PHP versions
  (e.g. if deemed to break BC)

* That the bug will be fixed in PECL jsonc and jsond, as well as in
  HHVM

* That we don't need to support older versions of those once we
  require one of the mentioned PHP versions

Change-Id: I67034c561d54d37dee961ada8c9cf5ccfd113da1
---

diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index eb5e632eb5..e45dd3a833 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -155,7 +155,6 @@ class FormatJson {
 
 		if ( $pretty !== false ) {
 			// Workaround for <https://bugs.php.net/bug.php?id=66021>
-			// Can be removed once we require PHP >= 5.4.28, 5.5.12, 5.6.0
 			if ( $bug66021 ) {
 				$json = preg_replace( self::WS_CLEANUP_REGEX, '', $json );
 			}