From f3402daf9154f88f57361b066bdbd8fa9f7fc375 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 28 Apr 2011 17:55:44 +0000 Subject: [PATCH] fixed not included participants which are email addresses or contacts in AS --- calendar/inc/class.calendar_activesync.inc.php | 4 ++-- calendar/inc/class.calendar_bo.inc.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/calendar/inc/class.calendar_activesync.inc.php b/calendar/inc/class.calendar_activesync.inc.php index 25b5e09d74..9970c72853 100644 --- a/calendar/inc/class.calendar_activesync.inc.php +++ b/calendar/inc/class.calendar_activesync.inc.php @@ -776,8 +776,8 @@ class calendar_activesync implements activesync_plugin_write } else { - list($info) = $this->calendar->resources[$uid[0]]['info'] ? - ExecMethod($this->resources[$uid[0]]['info'],substr($uid,1)) : array(false); + list($info) = $i = $this->calendar->resources[$uid[0]]['info'] ? + ExecMethod($this->calendar->resources[$uid[0]]['info'],substr($uid,1)) : array(false); if (!$info) continue; diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index 5a297035bf..3b57a26877 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -252,7 +252,7 @@ class calendar_bo if (!$ids) return null; $data = array(); - foreach(!is_array($ids) ? array($ids) : $ids as $id) + foreach((array)$ids as $id) { $email = $id; $name = ''; @@ -268,7 +268,7 @@ class calendar_bo 'name' => $name, ); } - //echo "

email_info(".print_r($ids,true).")="; _debug_array($data); + //error_log(__METHOD__.'('.array2string($ids).')='.array2string($data).' '.function_backtrace()); return $data; }