Adding in support to run Munee in a sub-directory.

meenie · Oct 18, 2013 · 7aafc64 · 7aafc64
1 parent 03e2552
commit 7aafc64
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -1,11 +1,13 @@
 <?php
 
 use Munee\Asset\Registry;
-
 // DIRECTORY_SEPARATOR alias
 defined('DS') || define('DS' , DIRECTORY_SEPARATOR);
+// Define Sub-Folder the Munee Dispatcher file is in
+$subFolder = dirname($_SERVER['SCRIPT_NAME']);
+defined('SUB_FOLDER') || define('SUB_FOLDER', '/' === $subFolder ? '' : $subFolder);
 // Define Webroot if hasn't already been defined
-defined('WEBROOT') || define('WEBROOT', str_replace($_SERVER['SCRIPT_NAME'], '', $_SERVER['SCRIPT_FILENAME']));
+defined('WEBROOT') || define('WEBROOT', str_replace($_SERVER['SCRIPT_NAME'], '', $_SERVER['SCRIPT_FILENAME']) . SUB_FOLDER);
 // Folder where Munee is located
 defined('MUNEE_FOLDER') || define('MUNEE_FOLDER', dirname(__DIR__));
 // Define the cache path

diff --git a/src/Munee/Asset/Type/Css.php b/src/Munee/Asset/Type/Css.php
@@ -173,7 +173,7 @@ protected function fixRelativeImagePaths($content, $originalFile)
             $filePath = trim($match[2]);
             // Skip conversion if the first character is a '/' since it's already an absolute path
             if ($filePath[0] !== '/') {
-                $basePath = str_replace($webroot, '', dirname($originalFile));
+                $basePath = SUB_FOLDER  . str_replace($webroot, '', dirname($originalFile));
                 $basePathParts = array_reverse(array_filter(explode('/', $basePath)));
                 $numOfRecursiveDirs = substr_count($filePath, '../');
                 if ($numOfRecursiveDirs > count($basePathParts)) {