1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 01:54:12 +02:00

Issue #2827 Support for multiple static domains for distributed static URLs.

This commit is contained in:
Cameron
2017-10-25 19:02:10 -07:00
parent 3668067bb1
commit 27910c87c7
3 changed files with 109 additions and 13 deletions

View File

@@ -1400,13 +1400,19 @@ class e_jsmanager
}
private function url($path,$cacheId = true)
/**
* Return the URL while checking for staticUrl configuration.
* @param $path
* @param bool $cacheId
* @return mixed|string
*/
private function url($path, $cacheId = true)
{
if((e_MOD_REWRITE_STATIC === true || defined('e_HTTP_STATIC')) && $this->isInAdmin() !== true)
if(/*(e_MOD_REWRITE_STATIC === true || defined('e_HTTP_STATIC')) &&*/ $this->isInAdmin() !== true)
{
$srch = array(
/* $srch = array(
e_PLUGIN_ABS,
e_THEME_ABS,
e_WEB_ABS
@@ -1430,10 +1436,15 @@ class e_jsmanager
return trim($folder);
}
$path = $folder;
$path = $folder;*/
$path = e107::getParser()->staticUrl($path);
}
if(strpos($path,'?')!==false)
{
$path .= "&".$this->getCacheId();