From 8e6180acc9fd0690fe1b8e520c30772df0abd38a Mon Sep 17 00:00:00 2001 From: Tijn Kuyper Date: Wed, 2 Oct 2019 11:41:47 +0200 Subject: [PATCH] Fixes #2694 - consistency for news items check in months_menu and blogcalender_menu --- e107_plugins/blogcalendar_menu/blogcalendar_menu.php | 4 ++-- e107_plugins/news/news_months_menu.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e107_plugins/blogcalendar_menu/blogcalendar_menu.php b/e107_plugins/blogcalendar_menu/blogcalendar_menu.php index 532153c8f..6bed71aff 100644 --- a/e107_plugins/blogcalendar_menu/blogcalendar_menu.php +++ b/e107_plugins/blogcalendar_menu/blogcalendar_menu.php @@ -111,7 +111,7 @@ if(false === $cached) $year_start = mktime(0, 0, 0, 1, 1, $req_year); $year_end = mktime(23, 59, 59, 12, 31, $req_year); - $sql->select("news", "news_id, news_datestamp", "news_class IN (".USERCLASS_LIST.") AND news_datestamp > ".intval($start)." AND news_datestamp < ".intval($end)); + $sql->select("news", "news_id, news_datestamp", "news_class IN (".USERCLASS_LIST.") AND (FIND_IN_SET('0', news_render_type) OR FIND_IN_SET(1, news_render_type)) AND news_datestamp > ".intval($start)." AND news_datestamp < ".intval($end)); $links = array(); $months = array(); @@ -221,4 +221,4 @@ if(false === $cached) } echo $cached; -?> +?> \ No newline at end of file diff --git a/e107_plugins/news/news_months_menu.php b/e107_plugins/news/news_months_menu.php index 0a9ca6f6d..350932b92 100644 --- a/e107_plugins/news/news_months_menu.php +++ b/e107_plugins/news/news_months_menu.php @@ -87,7 +87,7 @@ if(false === $cached) $month_links = array(); $sql->db_Mark_Time('News months menu'); - if(!$sql->select("news", "news_id, news_datestamp", "news_class IN (".USERCLASS_LIST.") AND news_datestamp > ".intval($start)." AND news_datestamp < ".intval($end)." ORDER BY news_datestamp DESC")) + if(!$sql->select("news", "news_id, news_datestamp", "news_class IN (".USERCLASS_LIST.") AND (FIND_IN_SET('0', news_render_type) OR FIND_IN_SET(1, news_render_type)) AND news_datestamp > ".intval($start)." AND news_datestamp < ".intval($end)." ORDER BY news_datestamp DESC")) { e107::getCache()->set($cString, ''); return ''; @@ -151,4 +151,4 @@ if(false === $cached) e107::getCache()->set($cString, $cached); } -echo $cached; +echo $cached; \ No newline at end of file