Skip to content
Extraits de code Groupes Projets
Valider af84e77a rédigé par florianjacob's avatar florianjacob Validation de Matthieu Aubry
Parcourir les fichiers

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.
parent 3b072a4e
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -106,7 +106,7 @@ abstract class UIAssetFetcher ...@@ -106,7 +106,7 @@ abstract class UIAssetFetcher
private function getBaseDirectory() private function getBaseDirectory()
{ {
// served by web server directly, so must be a public path // served by web server directly, so must be a public path
return PIWIK_USER_PATH; return PIWIK_DOCUMENT_ROOT;
} }
/** /**
......
...@@ -38,7 +38,7 @@ class StylesheetUIAssetMerger extends UIAssetMerger ...@@ -38,7 +38,7 @@ class StylesheetUIAssetMerger extends UIAssetMerger
protected function getMergedAssets() protected function getMergedAssets()
{ {
// note: we're using setImportDir on purpose (not addImportDir) // note: we're using setImportDir on purpose (not addImportDir)
$this->lessCompiler->setImportDir(PIWIK_USER_PATH); $this->lessCompiler->setImportDir(PIWIK_DOCUMENT_ROOT);
$concatenatedAssets = $this->getConcatenatedAssets(); $concatenatedAssets = $this->getConcatenatedAssets();
$this->lessCompiler->setFormatter('classic'); $this->lessCompiler->setFormatter('classic');
...@@ -183,7 +183,7 @@ class StylesheetUIAssetMerger extends UIAssetMerger ...@@ -183,7 +183,7 @@ class StylesheetUIAssetMerger extends UIAssetMerger
$baseDirectory = dirname($uiAsset->getRelativeLocation()); $baseDirectory = dirname($uiAsset->getRelativeLocation());
return function ($matches) use ($baseDirectory) { 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 // Allow to import extension less file
if (strpos($matches[2], '.') === false) { if (strpos($matches[2], '.') === false) {
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter