rysiek
/
owncalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #231 from libasys/patch-7 

Fix for long timed events
master
Georg Ehrke 2013-11-28 02:16:52 -08:00
parent 175b93aab0 a32fbfdecc
commit 348fc3bbf4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/object.php
View File

@ -62,14 +62,14 @@ class OC_Calendar_Object{
* in ['calendardata']
*/
public static function allInPeriod($id, $start, $end) {
$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*clndr_objects` WHERE `calendarid` = ?'
.' AND ((`startdate` >= ? AND `startdate` <= ? AND `repeating` = 0)'
.' OR (`enddate` >= ? AND `enddate` <= ? AND `repeating` = 0)'
.' OR (`startdate` <= ? AND `repeating` = 1))' );
$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*clndr_objects` WHERE `calendarid` = ? AND `objecttype`= ?'
.' AND ((`startdate` >= ? AND `enddate` <= ? AND `repeating` = 0)'
.' OR (`enddate` >= ? AND `startdate` <= ? AND `repeating` = 0)'
.' OR (`startdate` <= ? AND `repeating` = 1) )' );
$start = self::getUTCforMDB($start);
$end = self::getUTCforMDB($end);
$result = $stmt->execute(array($id,
$start, $end,
$result = $stmt->execute(array($id,'VEVENT',
$start, $end,
$start, $end,
$end));