fix PHP 8.x TypeError: array_intersect(): Argument #2 must be of type array, null given

This commit is contained in:
ralf 2022-04-26 11:29:39 +02:00
parent a835d5bc6e
commit 6bd9051589

View File

@ -171,8 +171,8 @@ class mail_acl
$content['grid'][$n]['acl_'. $right] = true; $content['grid'][$n]['acl_'. $right] = true;
} }
$virtualD = array('e','t'); $virtualD = array('e','t');
$content['grid'][$n]['acl_c'] = array_diff($virtuals['c'],array_intersect($rights,$virtuals['c']))? false: true; //c=kx more information rfc4314, Obsolote Rights $content['grid'][$n]['acl_c'] = array_diff($virtuals['c'],array_intersect($rights, $virtuals['c'] ?? []))? false: true; //c=kx more information rfc4314, Obsolete Rights
$content['grid'][$n]['acl_d'] = array_diff($virtualD,array_intersect($rights,$virtuals['d']))? false: true; //d=et more information rfc4314, Obsolote Rights $content['grid'][$n]['acl_d'] = array_diff($virtualD,array_intersect($rights,$virtuals['d'] ?? []))? false: true; //d=et more information rfc4314, Obsolete Rights
sort($rights); sort($rights);
$acl_abbrvs = implode('',$rights); $acl_abbrvs = implode('',$rights);
@ -599,4 +599,4 @@ class mail_acl
$mailbox = is_array($mailbox) ? $mailbox[0] : $mailbox; $mailbox = is_array($mailbox) ? $mailbox[0] : $mailbox;
return preg_replace("/^".$acc_id."::/",'', $mailbox); return preg_replace("/^".$acc_id."::/",'', $mailbox);
} }
} }