Skip to content

Commit

Permalink
BUGFIX: Calendar was not merging feeds from other calendars.
Browse files Browse the repository at this point in the history
  • Loading branch information
unclecheese committed Sep 12, 2012
1 parent 6b8c56a commit 09d130d
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions code/Calendar.php
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,8 @@ public function getDateToEventRelation() {


public function getEventList($start, $end, $filter = null, $limit = null, $announcement_filter = null) {

$eventList = new ArrayList();
foreach($this->getAllCalendars() as $calendar) {

$eventList = new ArrayList();
if($events = $calendar->getStandardEvents($start, $end, $filter)) {
$eventList->merge($events);
}
Expand Down Expand Up @@ -204,11 +202,9 @@ public function getEventList($start, $end, $filter = null, $limit = null, $annou

}

$eventList->sort(array("StartDate" => "ASC", "StartTime" => "ASC"));

// if($this->Feeds()) {
// $event_list = $this->importFromFeeds($event_list);
// }

$eventList = $eventList->sort(array("StartDate" => "ASC", "StartTime" => "ASC"));
$eventList = $eventList->limit($limit);

return $eventList;
}
Expand Down

0 comments on commit 09d130d

Please sign in to comment.