From 2a26aa688920dadd62ae0b48776744b0b6623a7b Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 29 Jul 2015 19:14:54 +1000
Subject: [PATCH] Fixes combiner to only move ../css when in ./less

---
 modules/system/classes/CombineAssets.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
index 53718d7df..dd0081627 100644
--- a/modules/system/classes/CombineAssets.php
+++ b/modules/system/classes/CombineAssets.php
@@ -496,7 +496,10 @@ class CombineAssets
 
             if ($extension == 'less') {
                 $cssPath = $path.'/../css';
-                if (File::isDirectory(File::symbolizePath($cssPath))) {
+                if (
+                    strtolower(basename($path)) == 'less' &&
+                    File::isDirectory(File::symbolizePath($cssPath))
+                ) {
                     $path = $cssPath;
                 }
                 $destination = $path.'/'.$file.'.css';