extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

* InfoLog: if searching do not suppress sub-entries (user preference "List no subs/childs" set)

Browse Source
This commit is contained in:
Ralf Becker 2012-05-15 14:27:26 +00:00
parent 5d7c91a66e
commit 60c5847df3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 = '';
}