From d51c3e07c62310a6531955176feeec9b30df4c71 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 1 May 2020 13:40:07 -0700
Subject: [PATCH] Closes #4124, #3686 - News template loading behavior. Added
 alert-dismissible for BS4.

---
 e107_handlers/message_handler.php | 2 +-
 e107_plugins/news/news.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/e107_handlers/message_handler.php b/e107_handlers/message_handler.php
index 8231bb7167..9f4f6088b2 100644
--- a/e107_handlers/message_handler.php
+++ b/e107_handlers/message_handler.php
@@ -591,7 +591,7 @@ public static function formatMessage($mstack, $type, $message)
 		$icon = !empty(self::$_customIcon[$type]) ? "s-message-empty fa fa-2x ".self::$_customIcon[$type] : "s-message-".$type;
 
 		
-		$text = "<div class='s-message alert alert-block fade in show {$type} {$bclass}' role='alert'>";
+		$text = "<div class='s-message alert alert-block alert-dismissible fade in show {$type} {$bclass}' role='alert'>";
 		$text .= (self::$_close[$type] === true) ? "<a class='close' data-dismiss='alert' aria-label='".LAN_CLOSE."'>×</a>" : "";
 		$text .= "<i class='s-message-icon ".$icon."'></i>
 				<h4 class='s-message-title'>".self::getTitle($type, $mstack)."</h4>
diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php
index 4587a9d854..0708b89417 100644
--- a/e107_plugins/news/news.php
+++ b/e107_plugins/news/news.php
@@ -985,7 +985,7 @@ private function renderListTemplate()
 
 		$action = $currentNewsAction;
 
-		if(deftrue('BOOTSTRAP'))  // v2.x
+		if(!deftrue('THEME_LEGACY'))  // v2.x
 		{
 			$template = e107::getTemplate('news', 'news', 'list');
 		}