extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 00:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some missed skip_notifications

Browse Source
This commit is contained in:
Nathan Gray 2012-12-18 16:00:29 +00:00
parent 9419fec5c6
commit 872fe5918e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -1396,8 +1396,9 @@ class calendar_boupdate extends calendar_bo
* @param array $new_event event-array with the new stati * @param array $new_event event-array with the new stati
* @param array $old_event event-array with the old stati * @param array $old_event event-array with the old stati
* @param int $recur_date=0 date to change, or 0 = all since now * @param int $recur_date=0 date to change, or 0 = all since now
* @param boolean $skip_notification Do not send notifications. Parameter passed on to set_status().
*/ */
function update_status($new_event, $old_event , $recur_date=0) function update_status($new_event, $old_event , $recur_date=0, $skip_notification=false)
{ {
if (!isset($new_event['participants'])) return; if (!isset($new_event['participants'])) return;
@ -1417,7 +1418,7 @@ class calendar_boupdate extends calendar_bo
// write the changes // write the changes
foreach ($new_event['participants'] as $userid => $status) foreach ($new_event['participants'] as $userid => $status)
{ {
$this->set_status($old_event, $userid, $status, $recur_date, true, false); $this->set_status($old_event, $userid, $status, $recur_date, true, false,$skip_notification);
} }
} }

4
calendar/inc/class.calendar_ical.inc.php
View File

@ -1691,7 +1691,7 @@ class calendar_ical extends calendar_boupdate
if ($event_info['acl_edit']) if ($event_info['acl_edit'])
{ {
// update all participants if we have the right to do that // update all participants if we have the right to do that
$this->update_status($event, $event_info['stored_event']); $this->update_status($event, $event_info['stored_event'],0,$skip_notification);
} }
elseif (isset($event['participants'][$this->user]) || isset($event_info['stored_event']['participants'][$this->user])) elseif (isset($event['participants'][$this->user]) || isset($event_info['stored_event']['participants'][$this->user]))
{ {
@ -1709,7 +1709,7 @@ class calendar_ical extends calendar_boupdate
if ($event_info['acl_edit']) if ($event_info['acl_edit'])
{ {
// update all participants if we have the right to do that // update all participants if we have the right to do that
$this->update_status($event, $event_info['stored_event'], $recurrence); $this->update_status($event, $event_info['stored_event'], $recurrence,$skip_notification);
} }
elseif (isset($event['participants'][$this->user]) || isset($event_info['master_event']['participants'][$this->user])) elseif (isset($event['participants'][$this->user]) || isset($event_info['master_event']['participants'][$this->user]))
{ {