From d0f8f348fefbcb242a8cc3b0bf4fa42208226b97 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 15 Sep 2021 19:25:10 -0700
Subject: [PATCH] Removed cacheID from cached JS/CSS URLs - now automatically
 included within filename hash.

---
 e107_handlers/js_manager.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/e107_handlers/js_manager.php b/e107_handlers/js_manager.php
index 1dc1c2ddc..65da9cece 100644
--- a/e107_handlers/js_manager.php
+++ b/e107_handlers/js_manager.php
@@ -1550,7 +1550,7 @@ class e_jsmanager
 			{
 				$path .= "&amp;".$this->getCacheId();
 			}
-			else
+			elseif($cacheId === true)
 			{
 				$path .= "?".$this->getCacheId();
 			}
@@ -1655,11 +1655,11 @@ class e_jsmanager
 
 			if($type == 'js')
 			{
-				echo "<script type='text/javascript' src='".$this->url(e_WEB_ABS."cache/".$fileName,'js','cache')."'></script>\n\n";
+				echo "<script type='text/javascript' src='".$this->url(e_WEB_ABS."cache/".$fileName,'js',false)."'></script>\n\n";
 			}
 			else
 			{
-				echo "<link type='text/css' href='".$this->url(e_WEB_ABS."cache/".$fileName,'cache')."' rel='stylesheet' property='stylesheet'  />\n\n";
+				echo "<link type='text/css' href='".$this->url(e_WEB_ABS."cache/".$fileName,false)."' rel='stylesheet' property='stylesheet'  />\n\n";
 				if(!empty($this->_cache_list['css_inline']))
 				{
 					echo $this->_cache_list['css_inline'];
@@ -1820,6 +1820,8 @@ class e_jsmanager
 			$id .= str_replace("../","",$p);
 		}
 
+		$id .= $this->getCacheId();
+
 		return hash('crc32', $id) ;
 
 	}