From f173b59672ff1a58c6626570e1793bcd237f6e5e Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 13 Aug 2021 10:58:42 -0700
Subject: [PATCH] Closes #4539

---
 e107_handlers/theme_handler.php       | 6 ++++--
 e107_tests/tests/unit/e_themeTest.php | 3 +++
 e107_themes/voux/theme.php            | 4 ----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index daceb5e06..4133f6271 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -1180,7 +1180,7 @@ class e_theme
 
 		$ret = [];
 
-		if(preg_match('/define[ ]*?\([\'|"]BOOTSTRAP[\'|"],[ \t]*(\d)\);/', $content, $m))
+		if(preg_match('/define[ ]*?\([\'|"]BOOTSTRAP[\'|"],[ \t]*(\d)\);/', $content, $m) && strpos($content,'bootstrap.min.css') === false && strpos($content,'bootstrap.min.js') === false)
 		{
 			$ret[] = array('name'  => 'bootstrap',
 					'version' => $m[1],
@@ -1188,7 +1188,7 @@ class e_theme
 			);
 		}
 
-		if(preg_match('/define[ ]*?\([\'|"]FONTAWESOME[\'|"],[ \t]*(\d)\);/', $content, $m))
+		if(preg_match('/define[ ]*?\([\'|"]FONTAWESOME[\'|"],[ \t]*(\d)\);/', $content, $m) && strpos($content, 'font-awesome.min.css') === false)
 		{
 			$ret[] = array('name'  => 'fontawesome',
 					'version' => $m[1],
@@ -1196,6 +1196,8 @@ class e_theme
 			);
 		}
 
+		e107::getDebug()->log($ret);
+
 		return $ret;
 	}
 
diff --git a/e107_tests/tests/unit/e_themeTest.php b/e107_tests/tests/unit/e_themeTest.php
index 1d7ebc2c1..95671de03 100644
--- a/e107_tests/tests/unit/e_themeTest.php
+++ b/e107_tests/tests/unit/e_themeTest.php
@@ -666,6 +666,9 @@ class e_themeTest extends \Codeception\Test\Unit
 		);
 
 		$this->assertSame($expected, $result);
+
+		// $result = e_theme::getLegacyBSFA('basic-light');
+		// var_dump($result);
 	}
 
 
diff --git a/e107_themes/voux/theme.php b/e107_themes/voux/theme.php
index 977c0b707..0e55ddfc7 100644
--- a/e107_themes/voux/theme.php
+++ b/e107_themes/voux/theme.php
@@ -21,10 +21,6 @@ define('VIEWPORT', 		"width=device-width, initial-scale=1.0");
 // Warning: Some bootstrap CDNs are not compiled with popup.js
 // use https if e107 is using https.
 
-/*e107::js("url",  "https://cdn.jsdelivr.net/bootstrap/3.3.6/js/bootstrap.min.js", 'jquery', 2);
-e107::css('url', 'https://cdn.jsdelivr.net/bootstrap/3.3.6/css/bootstrap.min.css');
-e107::css('url', 'https://cdn.jsdelivr.net/fontawesome/4.5.0/css/font-awesome.min.css');*/
-
 e107::library('load', 'bootstrap');
 e107::library('load', 'fontawesome');