From a9292caef01689ede2b521060c1acba2b5bac474 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 16 Jun 2019 13:45:05 -0700
Subject: [PATCH] Moved list detection to class2.

---
 class2.php                              |  4 ++++
 e107_handlers/news_class.php            | 24 ++----------------------
 e107_plugins/login_menu/login_menu.php  |  5 -----
 e107_plugins/news/news_archive_menu.php |  6 ------
 e107_plugins/news/news_months_menu.php  |  5 -----
 5 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/class2.php b/class2.php
index 481f831a0..f13ff250b 100755
--- a/class2.php
+++ b/class2.php
@@ -1188,6 +1188,10 @@ if (!class_exists('e107table', false))
 				$thm = new $this->themeClass();
 			}
 
+			// Automatic list detection .
+			$isList = (strpos(ltrim($text), '<ul ') !== false) ? true : false;
+			$this->setContent('list', $isList);
+
 			$options = $this->getContent();
 
 			$options['uniqueId'] = $this->uniqueId;
diff --git a/e107_handlers/news_class.php b/e107_handlers/news_class.php
index ce6f46df7..38c84960c 100644
--- a/e107_handlers/news_class.php
+++ b/e107_handlers/news_class.php
@@ -908,17 +908,7 @@ class e_news_tree extends e_front_tree_model
 				}
 
 				$mod = true === $tablerender ? 'news_latest_menu' : $tablerender;
-
-				if(strpos($ret,'<ul ') !== false)
-				{
-					e107::getRender()->setUniqueId(varset($parms['mode'], $mod))->setContent('list', true);
-				}
-
-				$text = e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
-
-
-
-				return $text;
+				return e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
 			}
 
 			if($return) return $ret;
@@ -1144,17 +1134,7 @@ class e_news_category_tree extends e_front_tree_model
 				}
 
 				$mod = true === $tablerender ? 'news_categories_menu' : $tablerender;
-
-				if(strpos($ret,'<ul ') !== false)
-				{
-					e107::getRender()->setUniqueId($mod)->setContent('list', true);
-				}
-
-				$text = e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
-
-
-
-				return $text;
+				return e107::getRender()->tablerender($caption, $ret, varset($parms['mode'], $mod), $return);
 			}
 
 			if($return) return $ret;
diff --git a/e107_plugins/login_menu/login_menu.php b/e107_plugins/login_menu/login_menu.php
index 2a290e798..a5eca699a 100644
--- a/e107_plugins/login_menu/login_menu.php
+++ b/e107_plugins/login_menu/login_menu.php
@@ -151,11 +151,6 @@ if (USER == TRUE || ADMIN == TRUE)
 		$caption = LAN_LOGINMENU_5.' '.USERNAME;
 	}
 	
-	//render
-	if(strpos($text,'<ul ') !== false)
-	{
-		$ns->setUniqueId('login-menu')->setContent('list', true);
-	}
 
 	$ns->tablerender($caption, $text, 'login');
 
diff --git a/e107_plugins/news/news_archive_menu.php b/e107_plugins/news/news_archive_menu.php
index ba34b658d..4cd76232a 100644
--- a/e107_plugins/news/news_archive_menu.php
+++ b/e107_plugins/news/news_archive_menu.php
@@ -104,12 +104,6 @@ e107::plugLan('news');
 
 $caption = !empty($parm['caption'][e_LANGUAGE]) ? $parm['caption'][e_LANGUAGE] : LAN_NEWSARCHIVE_MENU_TITLE;
 
-
-if(strpos($start,'<ul ') !== false)
-{
-	e107::getRender()->setUniqueId('news-archive-menu')->setContent('list', true);
-}
-
 e107::getRender()->tablerender($caption, $start.$text.$end, 'news-archive-menu');
 
 
diff --git a/e107_plugins/news/news_months_menu.php b/e107_plugins/news/news_months_menu.php
index cbd7c1893..84fb8b7cc 100644
--- a/e107_plugins/news/news_months_menu.php
+++ b/e107_plugins/news/news_months_menu.php
@@ -135,11 +135,6 @@ if(false === $cached)
 
 		}
 
-		if(strpos($cached,'<ul ') !== false)
-		{
-			e107::getRender()->setUniqueId('news-months-menu')->setContent('list', true);
-		}
-
 		$cached = $ns->tablerender(BLOGCAL_L1." ".$req_year, $cached, 'news_months_menu', true);