From 9b89e909af01d19f05291947d4dd673fa4e94add Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 17 Mar 2006 21:09:40 +0000 Subject: [PATCH] fixed problem in import reported by Lutz: global var and reference problem --- calendar/csv_import.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/calendar/csv_import.php b/calendar/csv_import.php index d90eccee6a..84d7285f5e 100644 --- a/calendar/csv_import.php +++ b/calendar/csv_import.php @@ -37,7 +37,7 @@ $GLOBALS['egw']->redirect_link('/admin/index.php'); } $GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Import CSV-File'); - $uical =& CreateObject('calendar.uical',true); + $cal =& CreateObject('calendar.uical',true); $GLOBALS['egw']->common->egw_header(); $GLOBALS['egw']->template->set_file(array('import_t' => 'csv_import.tpl')); @@ -472,7 +472,7 @@ { $values['uid'] = 'cal-csv-import-'.$values['uid'].'-'.$GLOBALS['egw_info']['server']['install_id']; } - if (($event = $uical->bo->read($values['uid'],null,$is_admin))) // no ACL check for admins + if (($event = $cal->bo->read($values['uid'],null,$is_admin))) // no ACL check for admins { //echo "updating existing event"; _debug_array($event); $values['id'] = $event['id']; @@ -480,7 +480,7 @@ } $action = $values['id'] ? 'updating' : 'adding'; //echo $action.'
'.print_r($values,True)."
\n"; - $cal_id = $uical->bo->update($values,true,!$values['modified'],$is_admin); // ignoring conflicts and ACL (for admins) on import + $cal_id = $cal->bo->update($values,true,!$values['modified'],$is_admin); // ignoring conflicts and ACL (for admins) on import $log .= "\t\t".''.($cal_id ? $action." cal_id=$cal_id" : 'Error '.$action)."\n\t\n"; }