forwardport of the recent xml-rpc-fixes in stable

This commit is contained in:
Carsten Wolff 2004-10-06 09:29:12 +00:00
parent 812f05a3e8
commit 466e423dbc
2 changed files with 4 additions and 3 deletions

View File

@ -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(

View File

@ -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
{