extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 19:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug [ 1107983 ] Repeating Events out of order/shifted

Browse Source
This commit is contained in:
Ralf Becker 2005-02-09 19:58:55 +00:00
parent a9328ad77f
commit f368adc1ae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1859,7 +1859,7 @@
$search_date_month = date('m',$datetime); $search_date_month = date('m',$datetime);
$search_date_day = date('d',$datetime); $search_date_day = date('d',$datetime);
$search_date_dow = date('w',$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) if($this->debug)
{ {
echo '<!-- Search Date Full = '.$search_date_full.' -->'."\n"; echo '<!-- Search Date Full = '.$search_date_full.' -->'."\n";
@ -1870,7 +1870,7 @@
{ {
$rep_events = $this->repeating_events[$i]; $rep_events = $this->repeating_events[$i];
$id = $rep_events['id']; $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) 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']); $event_recur_time = $this->maketime($rep_events['recur_enddate']);