Merge pull request #51 from LiamW/patch-2

Update CalendarEvent.php
unclecheese · May 21, 2014 · e336d06 · e336d06
2 parents e9d2842 + a969aaa
commit e336d06
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/code/CalendarEvent.php b/code/CalendarEvent.php
@@ -170,24 +170,25 @@ public function OtherDates() {
 		elseif(strtotime($_REQUEST['date']) > 0) {
 			$date = date('Y-m-d', strtotime($_REQUEST['date']));
 			$cal = $this->Parent();
-			if($this->Recursion == 1) {
-				$datetime_obj = DataList::create($this->data()->getDateTimeClass())
-					->where("EventID = {$this->ID}")
-					->first();
-				$datetime_obj->StartDate = $date;
-				return $cal->getNextRecurringEvents($this, $datetime_obj);
-			}
-			else {
-				return DataList::create($this->data()->getDateTimeClass())
-					->filter(array(
-						"EventID" => $this->ID						
-					))
-					->exclude(array(
-						"StartDate" => $date					
-					))
-					->sort("StartDate ASC")
-					->limit($cal->OtherDatesCount);
-			}
+		}
+
+		if($this->Recursion == 1) {
+			$datetime_obj = DataList::create($this->data()->getDateTimeClass())
+				->where("EventID = {$this->ID}")
+				->first();
+			$datetime_obj->StartDate = $date;
+			return $cal->getNextRecurringEvents($this, $datetime_obj);
+		}
+		else {
+			return DataList::create($this->data()->getDateTimeClass())
+				->filter(array(
+					"EventID" => $this->ID
+				))
+				->exclude(array(
+					"StartDate" => $date
+				))
+				->sort("StartDate ASC")
+				->limit($cal->OtherDatesCount);
 		}
 		return false;
 	}