From 504b762ff757ea6261ce1669ede00d1949ef0bb7 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 5 May 2011 07:56:58 +0000 Subject: [PATCH] fixed empty subs view, if subs are deleted and an other warning --- infolog/inc/class.infolog_so.inc.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php index 6196397669..756ea2c9fc 100644 --- a/infolog/inc/class.infolog_so.inc.php +++ b/infolog/inc/class.infolog_so.inc.php @@ -653,7 +653,10 @@ class infolog_so if ((int)$info_id <= 0) return 0; } $counts = array(); - foreach($this->db->select($this->info_table,'info_id_parent,COUNT(*) AS info_anz_subs',array('info_id_parent' => $info_id),__LINE__,__FILE__, + foreach($this->db->select($this->info_table,'info_id_parent,COUNT(*) AS info_anz_subs',array( + 'info_id_parent' => $info_id, + "info_status != 'deleted'", // dont count deleted subs as subs, as they are not shown by default + ),__LINE__,__FILE__, false,'GROUP BY info_id_parent','infolog') as $row) { $counts[$row['info_id_parent']] = (int)$row['info_anz_subs']; @@ -690,7 +693,9 @@ class infolog_so $action = isset($action2app[$query['action']]) ? $action2app[$query['action']] : $query['action']; if ($action != '') { - $links = solink::get_links($action=='sp'?'infolog':$action,explode(',',$query['action_id']),'infolog'); + $links = solink::get_links($action=='sp'?'infolog':$action, + is_array($query['action_id']) ? $query['action_id'] : explode(',',$query['action_id']),'infolog'); + if (count($links)) { $links = call_user_func_array('array_merge',$links); // flatten the array