diff options
author | Thomas ZILLIOX <thomas@zilliox.me> | 2014-05-14 18:11:06 +0400 |
---|---|---|
committer | Thomas ZILLIOX <thomas@zilliox.me> | 2014-05-14 18:11:06 +0400 |
commit | 61216b76870bb19ac1e01d05007d55da67c89556 (patch) | |
tree | a037da75d500a2f0dda0ad78d21f0025de4cacb4 /core/AssetManager | |
parent | fd1e293069de09d302e1a98d76f1cbe8ea69ec44 (diff) | |
parent | 6e2a00229edc01dcd2689955a16f9674dd9af813 (diff) |
Merge with master
Diffstat (limited to 'core/AssetManager')
-rw-r--r-- | core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php | 4 | ||||
-rw-r--r-- | core/AssetManager/UIAssetMinifier.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php index 05053be16c..ae47646396 100644 --- a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php +++ b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php @@ -9,10 +9,10 @@ namespace Piwik\AssetManager\UIAssetMerger; use Exception; +use lessc; use Piwik\AssetManager\UIAsset; use Piwik\AssetManager\UIAssetMerger; use Piwik\Piwik; -use lessc; class StylesheetUIAssetMerger extends UIAssetMerger { @@ -158,7 +158,7 @@ class StylesheetUIAssetMerger extends UIAssetMerger $rootDirectory = realpath($uiAsset->getBaseDirectory()); if ($rootDirectory != PATH_SEPARATOR - && substr_compare($rootDirectory, PATH_SEPARATOR, -1)) { + && substr($rootDirectory, -strlen(PATH_SEPARATOR)) !== PATH_SEPARATOR) { $rootDirectory .= PATH_SEPARATOR; } $rootDirectoryLen = strlen($rootDirectory); diff --git a/core/AssetManager/UIAssetMinifier.php b/core/AssetManager/UIAssetMinifier.php index 34006f5a32..4388ecaaa9 100644 --- a/core/AssetManager/UIAssetMinifier.php +++ b/core/AssetManager/UIAssetMinifier.php @@ -10,8 +10,8 @@ namespace Piwik\AssetManager; use Exception; -use Piwik\Singleton; use JShrink\Minifier; +use Piwik\Singleton; class UIAssetMinifier extends Singleton { |