From 1728f148a382eb7bdbdd961507e630ff40ae63c4 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Sun, 29 Jun 2014 09:34:49 +1000
Subject: [PATCH] Fixes #361 - Assets paths fail on subfolders

---
 modules/cms/classes/CombineAssets.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/cms/classes/CombineAssets.php b/modules/cms/classes/CombineAssets.php
index b34fdfb11..f1e41418d 100644
--- a/modules/cms/classes/CombineAssets.php
+++ b/modules/cms/classes/CombineAssets.php
@@ -260,8 +260,10 @@ class CombineAssets
      */
     protected function getTargetPath($path = null)
     {
-        if ($path === null)
-            $path = Request::getBaseUrl().'/combine';
+        if ($path === null) {
+            $baseUri = substr(Request::getBaseUrl(), strlen(Request::getBasePath()));
+            $path = $baseUri.'/combine';
+        }
 
         if (strpos($path, '/') === 0)
             $path = substr($path, 1);