mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-24 11:51:43 +02:00
"fixed not working caching to avoid multiple reads of same event from database
(condition !$date stoped caching for all non-repeating events)"
This commit is contained in:
parent
e5c782ca8e
commit
9e8a74b92e
@ -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'))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user