mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 14:41:29 +01:00
Calendar - Fix participant status reset to only reset [non-user participant's] status on start time change
This commit is contained in:
parent
458d35afe1
commit
45ea4cb81a
@ -2934,13 +2934,15 @@ class calendar_boupdate extends calendar_bo
|
|||||||
*/
|
*/
|
||||||
protected function check_reset_stati(&$event, $old_event)
|
protected function check_reset_stati(&$event, $old_event)
|
||||||
{
|
{
|
||||||
if(!$old_event || !is_array($old_event))
|
if(!$old_event || !is_array($old_event) || $event['start'] == $old_event['start'])
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$status_reset = false;
|
$status_reset = false;
|
||||||
$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
|
$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
|
||||||
|
$preferences = new Api\Preferences($uid);
|
||||||
|
$part_prefs = $preferences->read_repository();
|
||||||
foreach((array)$event['participants'] as $uid => $status)
|
foreach((array)$event['participants'] as $uid => $status)
|
||||||
{
|
{
|
||||||
$q = $r = null;
|
$q = $r = null;
|
||||||
@ -2953,8 +2955,6 @@ class calendar_boupdate extends calendar_bo
|
|||||||
// Just user accounts
|
// Just user accounts
|
||||||
if (is_int($uid))
|
if (is_int($uid))
|
||||||
{
|
{
|
||||||
$preferences = new Api\Preferences($uid);
|
|
||||||
$part_prefs = $preferences->read_repository();
|
|
||||||
switch ($part_prefs['calendar']['reset_stati'])
|
switch ($part_prefs['calendar']['reset_stati'])
|
||||||
{
|
{
|
||||||
case 'no':
|
case 'no':
|
||||||
|
Loading…
Reference in New Issue
Block a user