summaryrefslogtreecommitdiffstats
path: root/application/controllers/EventController.php
diff options
context:
space:
mode:
Diffstat (limited to 'application/controllers/EventController.php')
-rwxr-xr-xapplication/controllers/EventController.php14
1 files changed, 8 insertions, 6 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 57d8e65..f7754c8 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -765,12 +765,14 @@ class EventController extends Zend_Controller_Action
$overlapswithrepeat = array();
$cfeventswithrepeat = array();
+
foreach($events['withrepeat'] as $e) {
- $evstartTime = intval(strtotime($e['start'])) + $diff;
- if($e['running'] == 0 && $e['repeat'] == 1 && $evstartTime < time()) {
- $this->view->past = true;
- return;
- }
+
+ $evstartTime = intval(strtotime($e['start'])) + $diff;
+ if($e['running'] == 0 && $e['repeat'] == 1 && $evstartTime < time()) {
+ $this->view->past = true;
+ }
+
$enewstart = date('Y-m-d H:i:s', strtotime($e['start']) + $diff);
$summertimeStart = intval(date('I', strtotime($e['start'])));
@@ -971,7 +973,7 @@ class EventController extends Zend_Controller_Action
$summertimeEnd = 1;
}
}
-
+
$cfv = true;
// overlap events