mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-23 19:31:53 +02:00
fix error "Bad search filter" when accessing the calendar
This commit is contained in:
parent
50e67e5d46
commit
3ac7b858e4
@ -1054,7 +1054,7 @@ class Ads
|
|||||||
}
|
}
|
||||||
if (!empty($param['account_id']))
|
if (!empty($param['account_id']))
|
||||||
{
|
{
|
||||||
$account_ids_filter = '(|(objectsid='.implode(')(objectsid=', array_map([$this, 'get_sid'], (array)$param['account_id'])).')';
|
$account_ids_filter = '(|(objectsid='.implode(')(objectsid=', array_map([$this, 'get_sid'], (array)$param['account_id'])).'))';
|
||||||
$filter = $filter ? "(&$filter$account_ids_filter)" : $account_ids_filter;
|
$filter = $filter ? "(&$filter$account_ids_filter)" : $account_ids_filter;
|
||||||
}
|
}
|
||||||
if (!empty($param['modified']))
|
if (!empty($param['modified']))
|
||||||
|
@ -86,7 +86,6 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
|
|||||||
$options = array('account_type' => $type, 'tag_list' => true) + $accounts;
|
$options = array('account_type' => $type, 'tag_list' => true) + $accounts;
|
||||||
$accounts = Api\Accounts::link_query('', $options);
|
$accounts = Api\Accounts::link_query('', $options);
|
||||||
}
|
}
|
||||||
unset($list["accounts"][9]);
|
|
||||||
// Make sure the user themselves is in there
|
// Make sure the user themselves is in there
|
||||||
if(!array_key_exists($GLOBALS['egw_info']['user']['account_id'], $list['accounts']))
|
if(!array_key_exists($GLOBALS['egw_info']['user']['account_id'], $list['accounts']))
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user