From 8906cf1e2664dda9791e81f7704b8d35473bbb85 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 31 Dec 2020 11:46:53 -0800
Subject: [PATCH] When using Bootstrap 5 and no template is found, fallback to
 bootstrap 4 template if present in core folder.

---
 e107_handlers/e107_class.php                  | 26 ++++++++++++-------
 .../signin/templates/signin_template.php      |  4 +--
 e107_tests/tests/unit/db_table_adminTest.php  |  3 ---
 e107_tests/tests/unit/e_parseTest.php         |  2 +-
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index ac3918219..522f86d6d 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -2953,28 +2953,34 @@ class e107
 		$core_path_bs4				= e_CORE.'templates/bootstrap4/'.$id.'_template.php';
 		$core_path_bs5				= e_CORE.'templates/bootstrap5/'.$id.'_template.php';
 
+		$ret = $core_path;
+
 		if($override_path && is_readable($override_path)) // v2 override template.
 		{
-			return $override_path;
+			$ret = $override_path;
 		}
 		elseif($legacy_override_path && is_readable($legacy_override_path)) //v1 override template.
 		{
-			return $legacy_override_path;
+			$ret = $legacy_override_path;
 		}
 		elseif(THEME_LEGACY === true && is_readable($core_path_legacy)) //v1 core template.
 		{
-			return $core_path_legacy;
+			$ret = $core_path_legacy;
 		}
-		elseif(defset('BOOTSTRAP') === 4 && is_readable($core_path_bs4))
+		elseif(defset('BOOTSTRAP') > 3)
         {
-            return $core_path_bs4;
-        }
-		elseif(defset('BOOTSTRAP') === 5 && is_readable($core_path_bs5))
-        {
-            return $core_path_bs5;
+            if(is_readable($core_path_bs5))
+            {
+                $ret = $core_path_bs5;
+            }
+            elseif(is_readable($core_path_bs4))
+            {
+                $ret = $core_path_bs4;
+            }
+
         }
 
-		return $core_path;
+		return $ret;
 	}
 
 	/**
diff --git a/e107_plugins/signin/templates/signin_template.php b/e107_plugins/signin/templates/signin_template.php
index 20980ac16..bbe722879 100644
--- a/e107_plugins/signin/templates/signin_template.php
+++ b/e107_plugins/signin/templates/signin_template.php
@@ -9,7 +9,7 @@ $SIGNIN_TEMPLATE = [];
 $SIGNIN_WRAPPER['signin']['SIGNIN_SIGNUP_HREF'] = '<li class="nav-item"><a class="nav-link" href="{---}">{LAN=LAN_LOGINMENU_3}</a></li>';
 
 $SIGNIN_TEMPLATE['signin'] = '
-			<ul class="nav navbar-nav navbar-right nav-right">
+			<ul class="navbar-nav nav-right">
 				{SIGNIN_SIGNUP_HREF}
 				<li class="divider-vertical"></li>
 				<li class="nav-item dropdown">
@@ -48,7 +48,7 @@ $SIGNIN_WRAPPER['signout']['SIGNIN_PM_NAV'] = '<li class="dropdown">{---}</li>';
 
 $SIGNIN_TEMPLATE['signout'] = '
 
-		<ul class="nav navbar-nav navbar-right">
+		<ul class="navbar-nav navbar-right">
 			{SIGNIN_PM_NAV}
 			<li class="dropdown dropdown-avatar"><a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" data-toggle="dropdown">{USER_AVATAR: w=30&h=30&crop=1&shape=circle} {SIGNIN_USERNAME} <b class="caret"></b></a>
 				<ul class="dropdown-menu  ">
diff --git a/e107_tests/tests/unit/db_table_adminTest.php b/e107_tests/tests/unit/db_table_adminTest.php
index 8fce69852..c18d64f3a 100644
--- a/e107_tests/tests/unit/db_table_adminTest.php
+++ b/e107_tests/tests/unit/db_table_adminTest.php
@@ -346,9 +346,6 @@
 
 			$result = $this->dta->get_current_table('core');
 
-
-
-
 			$this->assertSame($result,$expected);
 
 		}
diff --git a/e107_tests/tests/unit/e_parseTest.php b/e107_tests/tests/unit/e_parseTest.php
index 822f6fc88..3771eb5f1 100644
--- a/e107_tests/tests/unit/e_parseTest.php
+++ b/e107_tests/tests/unit/e_parseTest.php
@@ -1049,7 +1049,7 @@ while(&#036;row = &#036;sql-&gt;fetch())
 			$result6 = preg_replace('/"([^"]*)thumb.php/','"thumb.php', $result6);
 
 		//	$result6 = str_replace($tempDir, '', $result6);
-
+			$expected = str_replace("\r", '', $expected);
 			$this->assertSame($expected,$result6);
 			$this->tp->setConvertToWebP(false);