From: Platonides <platonides@users.mediawiki.org>
Date: Tue, 22 Nov 2011 16:04:39 +0000 (+0000)
Subject: Follow-up r103865. Accept lowercase hex and remove empty statement.
X-Git-Tag: 1.31.0-rc.0~26358
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=f0e8973335572b26f4c8bb7fbba4503b48a9da09;p=lhc%2Fweb%2Fwiklou.git

Follow-up r103865. Accept lowercase hex and remove empty statement.
---

diff --git a/includes/libs/JavaScriptMinifier.php b/includes/libs/JavaScriptMinifier.php
index a45b1030f0..8cdc3273f4 100644
--- a/includes/libs/JavaScriptMinifier.php
+++ b/includes/libs/JavaScriptMinifier.php
@@ -489,7 +489,7 @@ class JavaScriptMinifier {
 			) {
 				// Hex numeric literal
 				$end++; // x or X
-				$end += strspn( $s, '0123456789ABCDEF', $end );
+				$end += strspn( $s, '0123456789ABCDEFabcdef', $end );
 				// @fixme if no hex digits, parse error
 			} elseif(
 				ctype_digit( $ch )
@@ -505,7 +505,7 @@ class JavaScriptMinifier {
 				}
 				$exponent = strspn( $s, 'eE', $end );
 				if( $exponent ) {
-					$end += $exponent;;
+					$end += $exponent;
 					// + sign is optional; - sign is required.
 					$end += strspn( $s, '-+', $end );
 					$end += strspn( $s, '0123456789', $end );