Ori.livneh has submitted this change and it was merged.

Change subject: Cherry-pick PS3 of Ib78c6281
......................................................................


Cherry-pick PS3 of Ib78c6281

Change-Id: I170a9d931be4288f85d92fd7ea446248825e4a87
---
M includes/libs/JavaScriptMinifier.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/includes/libs/JavaScriptMinifier.php 
b/includes/libs/JavaScriptMinifier.php
index 3629620..6bba111 100644
--- a/includes/libs/JavaScriptMinifier.php
+++ b/includes/libs/JavaScriptMinifier.php
@@ -565,7 +565,9 @@
                                $out .= ' ';
                                $lineLength++;
                        }
-                       if( $type === self::TYPE_LITERAL && ( $token === 'true' 
|| $token === 'false' ) ) {
+                       if( $type === self::TYPE_LITERAL && $state === 
self::EXPRESSION && $last !== '.' &&
+                               ( $token === 'true' || $token === 'false' ) )
+                       {
                                $token = ( $token === 'true' ) ? '!0' : '!1';
                        }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/231734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I170a9d931be4288f85d92fd7ea446248825e4a87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf18
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to