Commit 1dd6f892 authored by skummer's avatar skummer

ZP-209 #comment do not try to search for goid2 if it is not available #time 20m

git-svn-id: https://z-push.org/svn/z-push/trunk@1493 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
parent 6ad001d4
......@@ -602,7 +602,8 @@ If it is the first time this attendee has proposed a new date/time, increment th
function isInCalendar() {
$messageprops = mapi_getprops($this->message, Array($this->proptags['goid'], $this->proptags['goid2'], PR_RCVD_REPRESENTING_NAME));
$goid = $messageprops[$this->proptags['goid']];
$goid2 = $messageprops[$this->proptags['goid2']];
if (isset($messageprops[$this->proptags['goid2']]))
$goid2 = $messageprops[$this->proptags['goid2']];
$basedate = $this->getBasedateFromGlobalID($goid);
......@@ -621,11 +622,13 @@ If it is the first time this attendee has proposed a new date/time, increment th
// First try with GlobalID(0x3) (case 1)
$entryid = $this->findCalendarItems($goid, $calFolder);
// If not found then try with CleanGlobalID(0x23) (case 2)
if (!is_array($entryid))
if (!is_array($entryid) && isset($goid2))
$entryid = $this->findCalendarItems($goid2, $calFolder);
} else {
} else if (isset($goid2)) {
$entryid = $this->findCalendarItems($goid2, $calFolder);
}
else
return false;
return is_array($entryid);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment