use DateTime as type of parameter in the functions is_cached_inperiod and get_inperiod

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 4adfa28dd198ba1d93d1d4b47e99336bc1c303a6..4711bf7a2e32630bd1a7fa81ce2082d314e4145d 100644 (file)
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -378,8 +378,8 @@ class OC_Calendar_App{
                                                'description' => isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'',
                                                'lastmodified'=>$lastmodified,
                                                'allDay'=>$allday);
-               if(OC_Calendar_Object::isrepeating($id) && OC_Calendar_Repeat::is_cached_inperiod($event['id'], OC_Calendar_Object::getUTCforMDB($start), OC_Calendar_Object::getUTCforMDB($end))){
-                       $cachedinperiod = OC_Calendar_Repeat::get_inperiod($id, OC_Calendar_Object::getUTCforMDB($start), OC_Calendar_Object::getUTCforMDB($end));
+               if(OC_Calendar_Object::isrepeating($id) && OC_Calendar_Repeat::is_cached_inperiod($event['id'], $start, $end)){
+                       $cachedinperiod = OC_Calendar_Repeat::get_inperiod($id, $start, $end);
                        foreach($cachedinperiod as $cachedevent){
                                $dynamicoutput = array();
                                if($allday){

diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index d1b14eea911bc084c7a125a83bc67ff3ee88a2c7..4b9cbdcd4ba532c1f5e6c2fedda1d60128249e45 100644 (file)
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -27,8 +27,8 @@ class OC_Calendar_Repeat{
        /*
         * @brief returns the cache of an event in a specific peroid
         * @param (int) $id - id of the event
-        * @param (string) $from - start for period in UTC
-        * @param (string) $until - end for period in UTC
+        * @param (DateTime) $from - start for period in UTC
+        * @param (DateTime) $until - end for period in UTC
         * @return (array)
         */
        public static function get_inperiod($id, $from, $until){
@@ -36,8 +36,8 @@ class OC_Calendar_Repeat{
                .' AND ((startdate >= ? AND startdate <= ?)'
                .' OR (enddate >= ? AND enddate <= ?))');
                $result = $stmt->execute(array($id,
-                                       $from, $until,
-                                       $from, $until));
+                                       OC_Calendar_Object::getUTCforMDB($from), OC_Calendar_Object::getUTCforMDB($until),
+                                       OC_Calendar_Object::getUTCforMDB($from), OC_Calendar_Object::getUTCforMDB($until)));
                $return = array();
                while($row = $result->fetchRow()){
                        $return[] = $row;
@@ -164,8 +164,8 @@ class OC_Calendar_Repeat{
        /*
         * @brief checks if an event is already cached in a specific period
         * @param (int) id - id of the event
-        * @param (string) $from - start for period in UTC
-        * @param (string) $until - end for period in UTC
+        * @param (DateTime) $from - start for period in UTC
+        * @param (DateTime) $until - end for period in UTC
         * @return (bool)
         */
        public static function is_cached_inperiod($id, $start, $end){