diff --git a/addressbook/inc/class.boaddressbook.inc.php b/addressbook/inc/class.boaddressbook.inc.php index 2f85659dc4..26a2e4d45b 100644 --- a/addressbook/inc/class.boaddressbook.inc.php +++ b/addressbook/inc/class.boaddressbook.inc.php @@ -737,7 +737,7 @@ ), 'delete' => array( 'function' => 'delete_entry', - 'signature' => array(array(xmlrpcInt,xmlrpcInt)), + 'signature' => array(array(xmlrpcString,xmlrpcString)), 'docstring' => lang('Delete a single entry by passing the id.') ), 'read_list' => array( diff --git a/calendar/inc/class.bocalendar.inc.php b/calendar/inc/class.bocalendar.inc.php index 4ee6596fc1..669900315e 100755 --- a/calendar/inc/class.bocalendar.inc.php +++ b/calendar/inc/class.bocalendar.inc.php @@ -117,6 +117,7 @@ var $prefs; var $owner; + var $grants; var $holiday_color; var $printer_friendly = False; @@ -856,7 +857,7 @@ $this->so->add_attribute('id',$l_cal['id']); } - if($l_cal['rpt_use_end'] != 'y') + if( ($l_cal['rpt_use_end'] != 'y') && !$this->xmlrpc ) { $l_recur_enddate['year'] = 0; $l_recur_enddate['month'] = 0; @@ -2037,7 +2038,7 @@ } if (!isset($params['owner']) && @$this->xmlrpc) { - $owner_id = $GLOBALS['phpgw_info']['user']['user_id']; + $owner_id = $GLOBALS['phpgw_info']['user']['account_id']; } else {