[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php |
Date: |
Mon, 11 Dec 2006 09:03:15 +0000 |
CVSROOT: /sources/phpgroupware
Module name: calendar
Changes by: Sigurd Nes <sigurdne> 06/12/11 09:03:15
Modified files:
inc : class.bocalendar.inc.php
Log message:
notice
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.bocalendar.inc.php?cvsroot=phpgroupware&r1=1.117&r2=1.118
Patches:
Index: class.bocalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- class.bocalendar.inc.php 9 Dec 2006 16:03:50 -0000 1.117
+++ class.bocalendar.inc.php 11 Dec 2006 09:03:15 -0000 1.118
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.bocalendar.inc.php,v 1.117 2006/12/09 16:03:50 sigurdne
Exp $ */
+ /* $Id: class.bocalendar.inc.php,v 1.118 2006/12/11 09:03:15 sigurdne
Exp $ */
class bocalendar
{
@@ -1789,7 +1789,8 @@
}
if(date('Hi',mktime($event['start']['hour'],$event['start']['min'],$event['start']['sec'],$month,$day,$year))
<
date('Hi',mktime($this->cached_events[$date][$i]['start']['hour'],$this->cached_events[$date][$i]['start']['min'],$this->cached_events[$date][$i]['start']['sec'],$month,$day,$year)))
{
-
for($j=count($this->cached_events[$date]);$j>=$i;$j--)
+ //
for($j=count($this->cached_events[$date]);$j>=$i;$j--)
+
for($j=count($this->cached_events[$date]);$j>=($i+1);$j--)
{
$this->cached_events[$date][$j] = $this->cached_events[$date][$j-1];
}
@@ -1865,7 +1866,7 @@
}
else
{
- $freq =
$rep_events['recur_interval'];
+ $freq =
(isset($rep_events['recur_interval']) && $rep_events['recur_interval']
?$rep_events['recur_interval']:1);
$type =
$rep_events['recur_type'];
switch($type)
{