From 7764d6a378895c44f3189548c2b84f25480db382 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 19 Jan 2018 14:16:15 -0800
Subject: [PATCH] Fix for staticUrl() conflict.

---
 e107_handlers/e_parse_class.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index eca517742..ae92f7aed 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -2665,7 +2665,7 @@ class e_parse extends e_parser
 		$base = '';
 
 		$srch = array(
-			e_HTTP.e107::getFolder('media'),
+		//
 			e_PLUGIN_ABS,
 			e_THEME_ABS,
 			e_WEB_ABS,
@@ -2674,7 +2674,7 @@ class e_parse extends e_parser
 
 
 		$repl = array(
-			$http.$base.e107::getFolder('media'),
+
 			$http.$base.e107::getFolder('plugins'),
 			$http.$base.e107::getFolder('themes'),
 			$http.$base.e107::getFolder('web'),
@@ -2683,6 +2683,11 @@ class e_parse extends e_parser
 
 		$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;
 
 	}