diff options
| author | florianjacob <accounts+github@florianjacob.de> | 2017-07-26 01:50:27 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-07-26 01:50:27 +0300 |
| commit | af84e77a46b6bdd65630f8e2a4d783f7c2802ee3 (patch) | |
| tree | b4266803acf2d48829755d9add4a73c6714f31c1 /core | |
| parent | 3b072a4e486fe16d51627130a8f5702d980d5e88 (diff) | |
Correct PIWIK_USER_PATH to PIWIK_DOCUMENT_ROOT (#11661)
in UIAssetFetcher and StylesheetUIAssetMerger.
Resolves #11654, makes PIWIK_USER_PATH work again.
Presumably. the paths were just mixed up.
Diffstat (limited to 'core')
| -rw-r--r-- | core/AssetManager/UIAssetFetcher.php | 2 | ||||
| -rw-r--r-- | core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/AssetManager/UIAssetFetcher.php b/core/AssetManager/UIAssetFetcher.php index 6d710e1387..0b8e9b3a55 100644 --- a/core/AssetManager/UIAssetFetcher.php +++ b/core/AssetManager/UIAssetFetcher.php @@ -106,7 +106,7 @@ abstract class UIAssetFetcher private function getBaseDirectory() { // served by web server directly, so must be a public path - return PIWIK_USER_PATH; + return PIWIK_DOCUMENT_ROOT; } /** diff --git a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php index 3d5cad72b6..1d4fb4d4d2 100644 --- a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php +++ b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php @@ -38,7 +38,7 @@ class StylesheetUIAssetMerger extends UIAssetMerger protected function getMergedAssets() { // note: we're using setImportDir on purpose (not addImportDir) - $this->lessCompiler->setImportDir(PIWIK_USER_PATH); + $this->lessCompiler->setImportDir(PIWIK_DOCUMENT_ROOT); $concatenatedAssets = $this->getConcatenatedAssets(); $this->lessCompiler->setFormatter('classic'); @@ -183,7 +183,7 @@ class StylesheetUIAssetMerger extends UIAssetMerger $baseDirectory = dirname($uiAsset->getRelativeLocation()); return function ($matches) use ($baseDirectory) { - $absolutePath = PIWIK_USER_PATH . "/$baseDirectory/" . $matches[2]; + $absolutePath = PIWIK_DOCUMENT_ROOT . "/$baseDirectory/" . $matches[2]; // Allow to import extension less file if (strpos($matches[2], '.') === false) { |