mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

Fix for staticUrl() conflict.

Browse Source
This commit is contained in:
Cameron
2018-01-19 14:16:15 -08:00
parent b22b1c49cd
commit 7764d6a378
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_handlers/e_parse_class.php
View File

@@ -2665,7 +2665,7 @@ class e_parse extends e_parser
$base = ''; $base = '';
$srch = array( $srch = array(
e_HTTP.e107::getFolder('media'), //
e_PLUGIN_ABS, e_PLUGIN_ABS,
e_THEME_ABS, e_THEME_ABS,
e_WEB_ABS, e_WEB_ABS,
@@ -2674,7 +2674,7 @@ class e_parse extends e_parser
$repl = array( $repl = array(
$http.$base.e107::getFolder('media'),
$http.$base.e107::getFolder('plugins'), $http.$base.e107::getFolder('plugins'),
$http.$base.e107::getFolder('themes'), $http.$base.e107::getFolder('themes'),
$http.$base.e107::getFolder('web'), $http.$base.e107::getFolder('web'),
@@ -2683,6 +2683,11 @@ class e_parse extends e_parser
$ret = str_replace($srch,$repl,$path); $ret = str_replace($srch,$repl,$path);
if(strpos($ret, 'http') !== 0) // if not converted, check media folder also.
{
$ret = str_replace(e_MEDIA_ABS,$http.$base.e107::getFolder('media'),$ret);
}
return $ret; return $ret;
} }