forked from extern/egroupware
fixed bug [ 1107983 ] Repeating Events out of order/shifted
This commit is contained in:
parent
388b950a2a
commit
416fe7b620
@ -1885,7 +1885,7 @@
|
||||
$search_date_month = date('m',$datetime);
|
||||
$search_date_day = date('d',$datetime);
|
||||
$search_date_dow = date('w',$datetime);
|
||||
$search_beg_day = mktime(0,0,0,$search_date_month,$search_date_day,$search_date_year);
|
||||
$search_beg_day = mktime(0,0,0,$search_date_month,$search_date_day,$search_date_year,0);
|
||||
if($this->debug)
|
||||
{
|
||||
echo '<!-- Search Date Full = '.$search_date_full.' -->'."\n";
|
||||
@ -1896,7 +1896,7 @@
|
||||
{
|
||||
$rep_events = $this->repeating_events[$i];
|
||||
$id = $rep_events['id'];
|
||||
$event_beg_day = mktime(0,0,0,$rep_events['start']['month'],$rep_events['start']['mday'],$rep_events['start']['year']);
|
||||
$event_beg_day = mktime(0,0,0,$rep_events['start']['month'],$rep_events['start']['mday'],$rep_events['start']['year'],0);
|
||||
if($rep_events['recur_enddate']['month'] != 0 && $rep_events['recur_enddate']['mday'] != 0 && $rep_events['recur_enddate']['year'] != 0)
|
||||
{
|
||||
$event_recur_time = $this->maketime($rep_events['recur_enddate']);
|
||||
|
Loading…
Reference in New Issue
Block a user