Merge branch 'master' of github.com:piwik/piwik

3 files changed, 17 insertions, 7 deletions

diff --git a/core/AssetManager.php b/core/AssetManager.php
index c026be4ba2..90185a43f3 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -373,7 +373,7 @@ class AssetManager extends Singleton
     /**
      * @return UIAsset
      */
-    private function getMergedStylesheetAsset()
+    public function getMergedStylesheetAsset()
     {
         return $this->getMergedUIAsset(self::MERGED_CSS_FILE);
     }
diff --git a/core/Option.php b/core/Option.php
index 5d39866454..7f6ae85cab 100644
--- a/core/Option.php
+++ b/core/Option.php
@@ -163,7 +163,7 @@ class Option
             return $this->all[$name];
         }
         $value = Db::fetchOne('SELECT option_value ' .
-            'FROM `' . Common::prefixTable('option') . '`' .
+            'FROM `' . Common::prefixTable('option') . '` ' .
             'WHERE option_name = ?', $name);
         if ($value === false) {
             return false;
diff --git a/core/View.php b/core/View.php
index 8b78482201..6f140d4b91 100644
--- a/core/View.php
+++ b/core/View.php
@@ -252,8 +252,18 @@ class View implements ViewInterface
 
     protected function applyFilter_cacheBuster($output)
     {
-        $cacheBuster = UIAssetCacheBuster::getInstance()->piwikVersionBasedCacheBuster();
-        $tag = 'cb=' . $cacheBuster;
+        $assetManager = AssetManager::getInstance();
+
+        $stylesheet = $assetManager->getMergedStylesheetAsset();
+        if ($stylesheet->exists()) {
+            $content = $stylesheet->getContent();
+        } else {
+            $content = $assetManager->getMergedStylesheet()->getContent();
+        }
+
+        $cacheBuster = UIAssetCacheBuster::getInstance();
+        $tagJs       = 'cb=' . $cacheBuster->piwikVersionBasedCacheBuster();
+        $tagCss      = 'cb=' . $cacheBuster->md5BasedCacheBuster($content);
 
         $pattern = array(
             '~<script type=[\'"]text/javascript[\'"] src=[\'"]([^\'"]+)[\'"]>~',
@@ -264,9 +274,9 @@ class View implements ViewInterface
         );
 
         $replace = array(
-            '<script type="text/javascript" src="$1?' . $tag . '">',
-            '<script type="text/javascript" src="$1?' . $tag . '">',
-            '<link rel="stylesheet" type="text/css" href="$1?' . $tag . '" />',
+            '<script type="text/javascript" src="$1?' . $tagJs . '">',
+            '<script type="text/javascript" src="$1?' . $tagJs . '">',
+            '<link rel="stylesheet" type="text/css" href="$1?' . $tagCss . '" />',
             '$1="index.php?module=$2&amp;action=$3&amp;cb=',
         );