mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 07:53:39 +01:00
fix for bug [ 1023559 ] Infolog does not search all entries while linking
This commit is contained in:
parent
257251fe00
commit
69ba028568
@ -457,6 +457,7 @@
|
|||||||
$query = array(
|
$query = array(
|
||||||
'search' => $pattern,
|
'search' => $pattern,
|
||||||
'start' => 0,
|
'start' => 0,
|
||||||
|
'subs' => true,
|
||||||
);
|
);
|
||||||
$ids = $this->search($query);
|
$ids = $this->search($query);
|
||||||
$content = array();
|
$content = array();
|
||||||
|
@ -467,6 +467,7 @@
|
|||||||
@param $query[action] / $query[action_id] if only entries linked to a specified app/entry show be used
|
@param $query[action] / $query[action_id] if only entries linked to a specified app/entry show be used
|
||||||
@param &$query[start], &$query[total] nextmatch-parameters will be used and set if query returns less entries
|
@param &$query[start], &$query[total] nextmatch-parameters will be used and set if query returns less entries
|
||||||
@param $query[col_filter] array with column-name - data pairs, data == '' means no filter (!)
|
@param $query[col_filter] array with column-name - data pairs, data == '' means no filter (!)
|
||||||
|
@param $query[subs] boolean return subs or not, if unset the user preference is used
|
||||||
@returns array with id's as key of the matching log-entries
|
@returns array with id's as key of the matching log-entries
|
||||||
*/
|
*/
|
||||||
function search(&$query)
|
function search(&$query)
|
||||||
@ -546,7 +547,7 @@
|
|||||||
$pid = 'AND info_id_parent='.($action == 'sp' ? $query['action_id'] : 0);
|
$pid = 'AND info_id_parent='.($action == 'sp' ? $query['action_id'] : 0);
|
||||||
|
|
||||||
if (!$GLOBALS['phpgw_info']['user']['preferences']['infolog']['listNoSubs'] &&
|
if (!$GLOBALS['phpgw_info']['user']['preferences']['infolog']['listNoSubs'] &&
|
||||||
$action != 'sp')
|
$action != 'sp' || isset($query['subs']) && $query['subs'])
|
||||||
{
|
{
|
||||||
$pid = '';
|
$pid = '';
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user