mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-23 07:09:20 +01:00
* Calendar: fixed SQL error on search: Argument of OR must be of type boolean, not of type smallint
This commit is contained in:
parent
dffb0b87dd
commit
d7356a350f
@ -345,8 +345,8 @@ class calendar_so
|
|||||||
|
|
||||||
// Searching - restrict private to own or private grant
|
// Searching - restrict private to own or private grant
|
||||||
$private_grants = $GLOBALS['egw']->acl->get_ids_for_location($GLOBALS['egw_info']['user']['account_id'], EGW_ACL_PRIVATE, 'calendar');
|
$private_grants = $GLOBALS['egw']->acl->get_ids_for_location($GLOBALS['egw_info']['user']['account_id'], EGW_ACL_PRIVATE, 'calendar');
|
||||||
$private_filter = '(cal_public OR cal_owner = ' . $GLOBALS['egw_info']['user']['account_id'];
|
$private_filter = '(cal_public=1 OR cal_owner = ' . $GLOBALS['egw_info']['user']['account_id'];
|
||||||
if($private_grants) $private_filter .= ' OR !cal_public AND cal_owner IN (' . implode(',',$private_grants) . ')';
|
if($private_grants) $private_filter .= ' OR cal_public=0 AND cal_owner IN (' . implode(',',$private_grants) . ')';
|
||||||
$private_filter .= ')';
|
$private_filter .= ')';
|
||||||
$where[] = $private_filter;
|
$where[] = $private_filter;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user