extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 03:41:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

"fixed not working caching to avoid multiple reads of same event from database

Browse Source 
(condition !$date stoped caching for all non-repeating events)"
This commit is contained in:
Ralf Becker 2010-04-14 08:49:49 +00:00
parent e5c782ca8e
commit 9e8a74b92e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_bo.inc.php
View File

@ -779,7 +779,7 @@ class calendar_bo
{ {
if (is_array($ids) || !isset(self::$cached_event['id']) || self::$cached_event['id'] != $ids || if (is_array($ids) || !isset(self::$cached_event['id']) || self::$cached_event['id'] != $ids ||
self::$cached_event_date_format != $date_format || self::$cached_event_date_format != $date_format ||
self::$cached_event['recur_type'] != MCAL_RECUR_NONE && !is_null($date) && self::$cached_event_date != $date || (!$date || self::$cached_event['start'] < $date)) self::$cached_event['recur_type'] != MCAL_RECUR_NONE && self::$cached_event_date != $date)
{ {
$events = $this->so->read($ids,$date ? $this->date2ts($date,true) : 0); $events = $this->so->read($ids,$date ? $this->date2ts($date,true) : 0);
@ -802,7 +802,7 @@ class calendar_bo
} }
else else
{ {
$return =& self::$cached_event; $return = self::$cached_event;
} }
} }
if ($this->debug && ($this->debug > 1 || $this->debug == 'read')) if ($this->debug && ($this->debug > 1 || $this->debug == 'read'))
@ -855,7 +855,7 @@ class calendar_bo
} }
$ts_end = $ts + $event_length; $ts_end = $ts + $event_length;
// adjust ts_end for whole day events in case it does not fit due to // adjust ts_end for whole day events in case it does not fit due to
// spans over summer/wintertime adjusted days // spans over summer/wintertime adjusted days
if($event['whole_day'] && ($arr_end = $this->date2array($ts_end)) && if($event['whole_day'] && ($arr_end = $this->date2array($ts_end)) &&
@ -874,7 +874,7 @@ class calendar_bo
$ts_end = $ts_end_guess; // $ts_end_guess was ok $ts_end = $ts_end_guess; // $ts_end_guess was ok
} }
} }
$event['start'] = $ts; $event['start'] = $ts;
$event['end'] = $ts_end; $event['end'] = $ts_end;
$events[] = $event; $events[] = $event;