diff options
| author | zotlabs <mike@macgirvin.com> | 2016-11-02 17:00:29 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-11-02 17:00:29 -0700 |
| commit | 1f92c594c8ae7e5b77165a73ef09b34011f6478d (patch) | |
| tree | 5ce9544d903d128c927dc362be056600b3989c7b | |
| parent | f91031bd657f6c7bb25d93fc2c69a84846ee9f03 (diff) | |
| download | volse-hubzilla-1f92c594c8ae7e5b77165a73ef09b34011f6478d.tar.gz volse-hubzilla-1f92c594c8ae7e5b77165a73ef09b34011f6478d.tar.bz2 volse-hubzilla-1f92c594c8ae7e5b77165a73ef09b34011f6478d.zip | |
issue #575, when 'nofinish' is set on an event, invalid date was generated/stored
| -rw-r--r-- | Zotlabs/Module/Events.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index 347c94c50..1050845e3 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -57,9 +57,6 @@ class Events extends \Zotlabs\Web\Controller { $start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute); } - if($nofinish) { - $finish = NULL_DATE; - } if($finish_text) { $finish = $finish_text; @@ -67,6 +64,11 @@ class Events extends \Zotlabs\Web\Controller { else { $finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute); } + + if($nofinish) { + $finish = NULL_DATE; + } + if($adjust) { $start = datetime_convert(date_default_timezone_get(),'UTC',$start); @@ -207,8 +209,10 @@ class Events extends \Zotlabs\Web\Controller { killme(); } + logger('event: ' . print_r($datarray,true)); +dbg(1); $event = event_store_event($datarray); - +dbg(0); if($post_tags) $datarray['term'] = $post_tags; |