Merge branch '17.1' of github.com:EGroupware/egroupware into 17.1

api/src/Contacts.php

@@ -1650,7 +1650,7 @@ class Contacts extends Contacts\Storage
 			$data[] = array(
 				'res_id' => $id,
 				'email' => $contact['email'] ? $contact['email'] : $contact['email_home'],
-				'rights' => Acl::CUSTOM1,
+				'rights' => Acl::CUSTOM1|Acl::CUSTOM3,	// calendar_bo::ACL_READ_FOR_PARTICIPANTS|ACL_INVITE
 				'name' => $this->link_title($contact),
 				'cn' => trim($contact['n_given'].' '.$contact['n_family']),
 			);

calendar/inc/class.calendar_boupdate.inc.php

@@ -512,10 +512,6 @@ class calendar_boupdate extends calendar_bo
 			// Resource specific ACL check
 			return call_user_func($this->resources[$uid[0]]['check_invite'], $uid);
 		}
-		elseif (!is_numeric($uid)) // contact, no grant required
-		{
-			$ret = true;
-		}
 		elseif (!$this->require_acl_invite)
 		{
 			$ret = true;	// no grant required