Changeset 3306 for branches/2.2/calendar
- Timestamp:
- 09/29/10 16:49:28 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/calendar/inc/class.uicalendar.inc.php
r3284 r3306 1942 1942 { 1943 1943 if(!$overlapping_events){ 1944 $notify_message = lang(' Este evento entra em conflito com outro que você participa.');1944 $notify_message = lang('This event conflicts with your other event.'); 1945 1945 1946 1946 $action_ignore = $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uicalendar.set_action','cal_id' => $event[id], 'action' => 3, 'response' => 1,'user_id' => $user_id, 'ignore_conflict' => 1)); … … 2051 2051 (!isset($_GET['response']) && $_GET['action'] == 3 && !$_GET['ignore_conflict'] == 1)) 2052 2052 { 2053 if($event['id']) 2054 { 2055 $event_ids[] = $event['id']; 2056 } 2053 2057 if($event['reference']) 2054 2058 { 2055 2059 $event_ids[] = $event['reference']; 2056 2060 } 2057 $event['participants'] = Array($_GET['user_id'] => $event['participants'][$_GET['user_id']]); 2061 2062 $event['participants'] = Array($_SESSION['phpgw_info']['expressomail']['user']['account_id'] => $event['participants'][$_SESSION['phpgw_info']['expressomail']['user']['account_id']]); 2063 2058 2064 $overlapping_events = $this->bo->overlap( 2059 2065 $this->bo->maketime($event['start']), … … 4872 4878 { 4873 4879 $var = Array( 4874 'action_url_button' => $this->page('set_action','&cal_id='.$cal_id.'&action='.$param .'&user_id='.$this->bo->owner),4880 'action_url_button' => $this->page('set_action','&cal_id='.$cal_id.'&action='.$param), 4875 4881 'action_text_button' => ' '.$text.' ', 4876 4882 'action_confirm_button' => '',
Note: See TracChangeset
for help on using the changeset viewer.