From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 27 Aug 2014 22:22:50 +0000 (+0100)
Subject: Add cacheCode to dynamic resource urls
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c7d53039cf59f5ea9828b499f850ec594a7bb95e;p=civicrm-core.git

Add cacheCode to dynamic resource urls
---

diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php
index 82a18ccc0c..a95f4d4203 100644
--- a/CRM/Utils/File.php
+++ b/CRM/Utils/File.php
@@ -728,10 +728,14 @@ HTACCESS;
    * @param string $fileName
    * @return string
    */
-  static function dynamicResourceUrl($fileName) {
+  static function dynamicResourceUrl($fileName, $addCacheCode = TRUE) {
     $config = CRM_Core_Config::singleton();
     // FIXME: Need a better way of getting the url of the baseFilePath
-    return self::addTrailingSlash(str_replace('/persist/contribute', '', $config->imageUploadURL), '/') . 'dynamic/' . $fileName;
+    $url = self::addTrailingSlash(str_replace('/persist/contribute', '', $config->imageUploadURL), '/') . 'dynamic/' . $fileName;
+    if ($addCacheCode) {
+      return $url . '?r=' . CRM_Core_Resources::singleton()->getCacheCode();
+    }
+    return $url;
   }
 
   /**