diff options
author | mattab <matthieu.aubry@gmail.com> | 2014-04-04 07:31:45 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2014-04-04 07:31:45 +0400 |
commit | 9cc59e84a1819a79a079232ac857ed66db00abdd (patch) | |
tree | 90543fe37632738e01861ebcd3209f2b0ed57d15 /core | |
parent | a976f2c2f69879da21a903bc606461d636490bcf (diff) |
Fixes #4948 the logic does not always work on all windows, we must use windows path separators
Diffstat (limited to 'core')
-rw-r--r-- | core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php index b135cc0e82..29e487dff0 100644 --- a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php +++ b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php @@ -136,8 +136,10 @@ class StylesheetUIAssetMerger extends UIAssetMerger protected function countDirectoriesInPathToRoot($uiAsset) { $rootDirectory = realpath($uiAsset->getBaseDirectory()); - if ($rootDirectory != '/' && substr_compare($rootDirectory, '/', -1)) { - $rootDirectory .= '/'; + + if ($rootDirectory != PATH_SEPARATOR + && substr_compare($rootDirectory, PATH_SEPARATOR, -1)) { + $rootDirectory .= PATH_SEPARATOR; } $rootDirectoryLen = strlen($rootDirectory); return $rootDirectoryLen; |