From 60c5847df349b1fac9579882193f706eff4838cf Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 15 May 2012 14:27:26 +0000 Subject: [PATCH] * InfoLog: if searching do not suppress sub-entries (user preference "List no subs/childs" set) --- infolog/inc/class.infolog_so.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php index 128858237f..4af8960c14 100644 --- a/infolog/inc/class.infolog_so.inc.php +++ b/infolog/inc/class.infolog_so.inc.php @@ -857,8 +857,8 @@ class infolog_so } $pid = 'AND ' . $this->db->expression($this->info_table,array('info_id_parent' => ($action == 'sp' ?$query['action_id'] : 0))); - if (!$GLOBALS['egw_info']['user']['preferences']['infolog']['listNoSubs'] && - $action != 'sp' || isset($query['subs']) && $query['subs']) + if (!$GLOBALS['egw_info']['user']['preferences']['infolog']['listNoSubs'] && $action != 'sp' || + isset($query['subs']) && $query['subs'] || $action != 'sp' && !empty($query['search'])) { $pid = ''; }