From 974ecf82fe2f037c5cfcbed27ce07b4d3c702b2e Mon Sep 17 00:00:00 2001 From: MDW Date: Mon, 25 Mar 2024 11:09:40 +0100 Subject: [PATCH] Fix get_class on potential null --- htdocs/core/lib/functions.lib.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index b01c5eec55e..4e1a060151a 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -13280,11 +13280,8 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null, $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id"; - if (get_class($filterobj) !== 'User') { - $force_filter_contact = false; - } else { - $force_filter_contact = true; - } + $force_filter_contact = $filterobj instanceof User; + if (is_object($objcon) && $objcon->id > 0) { $force_filter_contact = true; $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";