Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Moumné <julien@piwik.org>2013-12-17 20:52:36 +0400
committerJulien Moumné <julien@piwik.org>2013-12-17 20:52:36 +0400
commit6624e27e575d6056da7881bc05e9972c50ec1128 (patch)
tree06bec63f550d16ccc8a428d40a79604496ce0985 /core/ProxyHttp.php
parent5d44202fb79a9b2aa70b00ec88fd316f83a440b0 (diff)
fixes #4373, #1640
Diffstat (limited to 'core/ProxyHttp.php')
-rw-r--r--core/ProxyHttp.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/ProxyHttp.php b/core/ProxyHttp.php
index b35d749342..692e8219bb 100644
--- a/core/ProxyHttp.php
+++ b/core/ProxyHttp.php
@@ -91,8 +91,7 @@ class ProxyHttp
// optional compression
$compressed = false;
$encoding = '';
- $compressedFileLocation = PIWIK_USER_PATH . AssetManager::COMPRESSED_FILE_LOCATION . basename($file);
- $compressedFileLocation = SettingsPiwik::rewriteTmpPathWithHostname($compressedFileLocation);
+ $compressedFileLocation = AssetManager::getInstance()->getAssetDirectory() . '/' . basename($file);
$phpOutputCompressionEnabled = ProxyHttp::isPhpOutputCompressed();
if (isset($_SERVER['HTTP_ACCEPT_ENCODING']) && !$phpOutputCompressionEnabled) {