From a82a7940f667d4eccdc0197d7ded786dc5efe474 Mon Sep 17 00:00:00 2001 From: Platonides Date: Tue, 22 Nov 2011 18:56:55 +0000 Subject: [PATCH] Final fixup to r103910 and follow-ups. Reverts r103931 test change. --- includes/libs/JavaScriptMinifier.php | 2 +- tests/phpunit/includes/libs/JavaScriptMinifierTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/libs/JavaScriptMinifier.php b/includes/libs/JavaScriptMinifier.php index fc815e2a9d..baf9338542 100644 --- a/includes/libs/JavaScriptMinifier.php +++ b/includes/libs/JavaScriptMinifier.php @@ -504,7 +504,7 @@ class JavaScriptMinifier { if ( $decimal > 2 ) { return self::parseError($s, $end, 'The number has too many decimal points' ); } - $end += strspn( $s, '0123456789', $end ) + 1; + $end += strspn( $s, '0123456789', $end + 1 ) + $decimal; } $exponent = strspn( $s, 'eE', $end ); if( $exponent ) { diff --git a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php index 8303e7979f..d2bfeedfcf 100644 --- a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php +++ b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php @@ -121,7 +121,7 @@ class JavaScriptMinifierTest extends MediaWikiTestCase { $suffix = ',shortVarName=0;'; $input = $prefix . $num . $suffix; - $expected = $prefix . $num . "\n" . $suffix; + $expected = $prefix . "\n" . $num . $suffix; $minified = JavaScriptMinifier::minify( $input ); -- 2.20.1