From: paladox <thomasmulhall410@yahoo.com>
Date: Wed, 19 Nov 2014 07:25:26 +0000 (+0000)
Subject: Update lessphp to 011afcca8e
X-Git-Tag: 1.31.0-rc.0~13192
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=9d97fb855c91a6e9cdd44dcd8d61086ed127b665;ds=sidebyside

Update lessphp to 011afcca8e

Source:

* https://github.com/leafo/lessphp/blob/011afcca8e6f1000a6e789921ba805fa578271a3/lessc.inc.php

Changes:

* https://github.com/leafo/lessphp/compare/2cc77e3c7b...011afcca8e

Change-Id: Ic21b97e52ec99b8eef094a902ee346cf40a9f174
---

diff --git a/includes/libs/lessc.inc.php b/includes/libs/lessc.inc.php
index 61ed771afa..2caa0b62fa 100644
--- a/includes/libs/lessc.inc.php
+++ b/includes/libs/lessc.inc.php
@@ -1,7 +1,7 @@
 <?php
 // @codingStandardsIgnoreFile File external to MediaWiki. Ignore coding conventions checks.
 /**
- * lessphp v0.4.0@2cc77e3c7b
+ * lessphp v0.4.0@011afcca8e
  * http://leafo.net/lessphp
  *
  * LESS CSS compiler, adapted from http://lesscss.org
@@ -374,9 +374,9 @@ class lessc {
 		$other = array_merge($other, $stack);
 
 		if ($split) {
-			return array(array_merge($vars, $imports), $other);
+			return array(array_merge($imports, $vars), $other);
 		} else {
-			return array_merge($vars, $imports, $other);
+			return array_merge($imports, $vars, $other);
 		}
 	}
 
@@ -1036,7 +1036,7 @@ class lessc {
 					}
 				}
 
-				if(!is_null($mime)) // fallback if the MIME type is still unknown
+				if(!is_null($mime)) // fallback if the mime type is still unknown
 					$url = sprintf('data:%s;base64,%s', $mime, base64_encode(file_get_contents($fullpath)));
 			}
 		}