summaryrefslogtreecommitdiffstats
path: root/application/controllers/EventController.php
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-10 15:36:14 +0200
committerBjörn Geiger2011-10-10 15:36:14 +0200
commit6ad8b3a8c3e31c4689d008b8e29a101e3ed8d12f (patch)
tree9ebe3a6805f7c6b3bc0402616c4e52e0abfa87f2 /application/controllers/EventController.php
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl (diff)
downloadpoolctrl-6ad8b3a8c3e31c4689d008b8e29a101e3ed8d12f.tar.gz
poolctrl-6ad8b3a8c3e31c4689d008b8e29a101e3ed8d12f.tar.xz
poolctrl-6ad8b3a8c3e31c4689d008b8e29a101e3ed8d12f.zip
kleine Korrekturen
Diffstat (limited to 'application/controllers/EventController.php')
-rwxr-xr-xapplication/controllers/EventController.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index ab001f5..7365d2a 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -430,9 +430,9 @@ class EventController extends Zend_Controller_Action
unset($params[$configName]);
$event->setPbs_configID(null);
}
- $params['start'] = date ('Y-m-d H:i', strtotime($params['start']));
+ $params['start'] = date ('Y-m-d H:i:s', strtotime($params['start']));
if(isset($params['end'])) {
- $params['end'] = date ('Y-m-d H:i', strtotime($params['end']));
+ $params['end'] = date ('Y-m-d H:i:s', strtotime($params['end']));
} else {
unset($params['end']);
}
@@ -443,7 +443,7 @@ class EventController extends Zend_Controller_Action
unset($params['repeatend']);
}
if(isset($params['repeatdate'])) {
- $params['repeatdate'] = date ('Y-m-d H:i', strtotime($params['repeatdate']));
+ $params['repeatdate'] = date ('Y-m-d H:i:s', strtotime($params['repeatdate']));
} else {
unset($params['repeatdate']);
}
@@ -2215,7 +2215,7 @@ class EventController extends Zend_Controller_Action
private function editRepeatEvent(Application_Model_Event $oldEvent, Application_Model_Event $newEvent) {
$diff = $this->eventMapper->compare($newEvent, $oldEvent);
if(isset($diff['start']) || isset($diff['end']) || isset($diff['pbs_filterID'])) {
-
+
} else {
$events = $this->eventMapper->findBy(array($oldEvent->getTitle()));
try {
@@ -2246,4 +2246,4 @@ class EventController extends Zend_Controller_Action
return;
}
}
-}
+} \ No newline at end of file