summaryrefslogtreecommitdiffstats
path: root/apps/calendar/lib
diff options
context:
space:
mode:
authorGeorg Ehrke <ownclouddev@georgswebsite.de>2011-11-12 22:02:04 +0100
committerGeorg Ehrke <ownclouddev@georgswebsite.de>2011-11-12 22:02:04 +0100
commita303992d781db9d6714522014f4903ce89c62127 (patch)
treea43ebeb0fb4405a6b7ad7f7aeddb5802a2cb90fa /apps/calendar/lib
parenteea20e51d8d96e91a7899704cad48811152fe143 (diff)
downloadnextcloud-server-a303992d781db9d6714522014f4903ce89c62127.tar.gz
nextcloud-server-a303992d781db9d6714522014f4903ce89c62127.zip
support for repeating events
Diffstat (limited to 'apps/calendar/lib')
-rw-r--r--apps/calendar/lib/object.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index ccc62d565e8..58d46ce6a7d 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -43,12 +43,12 @@ class OC_Calendar_Object{
public static function allInPeriod($id, $start, $end){
$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*calendar_objects WHERE calendarid = ?'
.' AND ((startdate >= ? AND startdate <= ? AND repeating = 0)'
- .' OR (startdate <= ? AND enddate >= ? AND repeating = 1))' );
+ .' OR (startdate <= ? AND repeating = 1))' );
$start = self::getUTCforMDB($start);
$end = self::getUTCforMDB($end);
$result = $stmt->execute(array($id,
$start, $end,
- $end, $start));
+ $end));
$calendarobjects = array();
while( $row = $result->fetchRow()){