extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-01 16:51:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed empty subs view, if subs are deleted and an other warning

Browse Source
This commit is contained in:
Ralf Becker 2011-05-05 07:56:58 +00:00
parent b52b7acf8a
commit 504b762ff7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
infolog/inc/class.infolog_so.inc.php
View File

@ -653,7 +653,10 @@ class infolog_so
if ((int)$info_id <= 0) return 0; if ((int)$info_id <= 0) return 0;
} }
$counts = array(); $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) false,'GROUP BY info_id_parent','infolog') as $row)
{ {
$counts[$row['info_id_parent']] = (int)$row['info_anz_subs']; $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']; $action = isset($action2app[$query['action']]) ? $action2app[$query['action']] : $query['action'];
if ($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)) if (count($links))
{ {
$links = call_user_func_array('array_merge',$links); // flatten the array $links = call_user_func_array('array_merge',$links); // flatten the array