Merge pull request #9693 from totten/master-browser-cache

CRM_Extension_Browser - Allow different cache files for different feeds
civicrm · Jan 18, 2017 · b08ff38 · b08ff38
2 parents 2f5cb1e + 5bcef2c
commit b08ff38
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/CRM/Extension/Browser.php b/CRM/Extension/Browser.php
@@ -216,8 +216,11 @@ private function _discoverRemote() {
    * @return string
    */
   private function grabCachedJson() {
-    $filename = $this->cacheDir . DIRECTORY_SEPARATOR . self::CACHE_JSON_FILE;
-    $json = file_get_contents($filename);
+    $filename = $this->cacheDir . DIRECTORY_SEPARATOR . self::CACHE_JSON_FILE . '.' . md5($this->getRepositoryUrl());
+    $json = NULL;
+    if (file_exists($filename)) {
+      $json = file_get_contents($filename);
+    }
     if (empty($json)) {
       $json = $this->grabRemoteJson();
     }
@@ -246,7 +249,7 @@ private function grabRemoteJson() {
       return array();
     }
 
-    $filename = $this->cacheDir . DIRECTORY_SEPARATOR . self::CACHE_JSON_FILE;
+    $filename = $this->cacheDir . DIRECTORY_SEPARATOR . self::CACHE_JSON_FILE . '.' . md5($this->getRepositoryUrl());
     $url = $this->getRepositoryUrl() . $this->indexPath;
     $status = CRM_Utils_HttpClient::singleton()->fetch($url, $filename);