BUGFIX: getStandardEvents() not respecting filter

guyvanbael · Oct 30, 2012 · eeaf856 · eeaf856
1 parent a0fd3f3
commit eeaf856
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/code/Calendar.php b/code/Calendar.php
@@ -230,6 +230,10 @@ protected function getStandardEvents($start, $end, $filter = null) {
 		");
 		$list = $list->filter(array($relation => $ids));				
 		$list = $list->innerJoin($event_class, "$relation = \"{$event_class}\".ID");
+		$list = $list->innerJoin("SiteTree", "\"SiteTree\".ID = \"{$event_class}\".ID");
+		if($filter) {
+			$list = $list->where($filter);
+		}
 		return $list;
 	}