Index: branches/5.1.x/core/units/helpers/minifiers/minify_helper.php =================================================================== diff -u -N -r13690 -r13702 --- branches/5.1.x/core/units/helpers/minifiers/minify_helper.php (.../minify_helper.php) (revision 13690) +++ branches/5.1.x/core/units/helpers/minifiers/minify_helper.php (.../minify_helper.php) (revision 13702) @@ -1,6 +1,6 @@ use it - return $this->Application->BaseURL(WRITEBALE_BASE) . sprintf($file_mask, $this->compressInfo[$hash]); + return $this->Application->BaseURL( str_replace(DIRECTORY_SEPARATOR, '/', WRITEBALE_BASE)) . sprintf($file_mask, $this->compressInfo[$hash]); } /** Index: branches/5.1.x/core/kernel/startup.php =================================================================== diff -u -N -r13581 -r13702 --- branches/5.1.x/core/kernel/startup.php (.../startup.php) (revision 13581) +++ branches/5.1.x/core/kernel/startup.php (.../startup.php) (revision 13702) @@ -1,6 +1,6 @@ configFiles); } else { - $this->findConfigFiles(FULL_PATH . '/core'); // search from core directory + $this->findConfigFiles(FULL_PATH . DIRECTORY_SEPARATOR . 'core'); // search from core directory $this->findConfigFiles($folderPath); // search from modules directory } @@ -799,7 +799,7 @@ $prefix = array_key_exists('Prefix', $config) ? $config['Prefix'] : ''; preg_match($this->_moduleFolderRegExp, $filename, $rets); - $config['ModuleFolder'] = $rets[1]; + $config['ModuleFolder'] = str_replace(DIRECTORY_SEPARATOR, '/', $rets[1]); $config['BasePath'] = dirname(FULL_PATH . $filename); if (array_key_exists('AdminTemplatePath', $config)) { @@ -994,7 +994,7 @@ $module_paths = Array (); foreach ($this->Application->ModuleInfo as $module_name => $module_info) { - $module_paths[] = rtrim($module_info['Path'], '/'); + $module_paths[] = str_replace('/', DIRECTORY_SEPARATOR, rtrim($module_info['Path'], '/')); } $module_paths = array_unique($module_paths);