summaryrefslogtreecommitdiff
path: root/plugins/calendar/drivers/database/database_driver.php
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/calendar/drivers/database/database_driver.php')
-rw-r--r--plugins/calendar/drivers/database/database_driver.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
index 8cd363c..a2cb903 100644
--- a/plugins/calendar/drivers/database/database_driver.php
+++ b/plugins/calendar/drivers/database/database_driver.php
@@ -724,7 +724,7 @@ class database_driver extends calendar_driver
*
* @see calendar_driver::load_events()
*/
- public function load_events($start, $end, $query = null, $calendars = null)
+ public function load_events($start, $end, $query = null, $calendars = null, $virtual = 1, $modifiedsince = null)
{
if (empty($calendars))
$calendars = array_keys($this->calendars);
@@ -742,6 +742,12 @@ class database_driver extends calendar_driver
$sql_add = 'AND (' . join(' OR ', $sql_query) . ')';
}
+ if (!$virtual)
+ $sql_arr .= ' AND e.recurrence_id = 0';
+
+ if ($modifiedsince)
+ $sql_add .= ' AND e.changed >= ' . $this->rc->db->quote(date('Y-m-d H:i:s', $modifiedsince));
+
$events = array();
if (!empty($calendar_ids)) {
$result = $this->rc->db->query(sprintf(