From b02e4d7ecf2fd44cbe40d3995aa801050be6fa9e Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Fri, 5 Aug 2016 07:50:51 +1000
Subject: [PATCH] Resolve paths correctly when deep hashing Fixes #2270

---
 modules/system/classes/CombineAssets.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
index e2e4d84f6..93268c5f3 100644
--- a/modules/system/classes/CombineAssets.php
+++ b/modules/system/classes/CombineAssets.php
@@ -401,7 +401,7 @@ class CombineAssets
         $key = '';
 
         $assetFiles = array_map(function($file) {
-            return $this->localPath.'/'.$file;
+            return File::symbolizePath($file, null) ?: $this->localPath . $file;
         }, $assets);
 
         foreach ($assetFiles as $file) {