mirror of
https://github.com/e107inc/e107.git
synced 2025-07-31 03:40:37 +02:00
Removed cacheID from cached JS/CSS URLs - now automatically included within filename hash.
This commit is contained in:
@@ -1550,7 +1550,7 @@ class e_jsmanager
|
|||||||
{
|
{
|
||||||
$path .= "&".$this->getCacheId();
|
$path .= "&".$this->getCacheId();
|
||||||
}
|
}
|
||||||
else
|
elseif($cacheId === true)
|
||||||
{
|
{
|
||||||
$path .= "?".$this->getCacheId();
|
$path .= "?".$this->getCacheId();
|
||||||
}
|
}
|
||||||
@@ -1655,11 +1655,11 @@ class e_jsmanager
|
|||||||
|
|
||||||
if($type == 'js')
|
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
|
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']))
|
if(!empty($this->_cache_list['css_inline']))
|
||||||
{
|
{
|
||||||
echo $this->_cache_list['css_inline'];
|
echo $this->_cache_list['css_inline'];
|
||||||
@@ -1820,6 +1820,8 @@ class e_jsmanager
|
|||||||
$id .= str_replace("../","",$p);
|
$id .= str_replace("../","",$p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$id .= $this->getCacheId();
|
||||||
|
|
||||||
return hash('crc32', $id) ;
|
return hash('crc32', $id) ;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user