harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #575, when 'nofinish' is set on an event, invalid date was generated/stored

Browse Source
This commit is contained in:
zotlabs 2016-11-02 17:00:29 -07:00
parent f91031bd65
commit 1f92c594c8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Zotlabs/Module/Events.php
View File

@ -57,9 +57,6 @@ class Events extends \Zotlabs\Web\Controller {
$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute); $start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
} }
if($nofinish) {
$finish = NULL_DATE;
}
if($finish_text) { if($finish_text) {
$finish = $finish_text; $finish = $finish_text;
@ -68,6 +65,11 @@ class Events extends \Zotlabs\Web\Controller {
$finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute); $finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute);
} }
if($nofinish) {
$finish = NULL_DATE;
}
if($adjust) { if($adjust) {
$start = datetime_convert(date_default_timezone_get(),'UTC',$start); $start = datetime_convert(date_default_timezone_get(),'UTC',$start);
if(! $nofinish) if(! $nofinish)
@ -207,8 +209,10 @@ class Events extends \Zotlabs\Web\Controller {
killme(); killme();
} }
logger('event: ' . print_r($datarray,true));
dbg(1);
$event = event_store_event($datarray); $event = event_store_event($datarray);
dbg(0);
if($post_tags) if($post_tags)
$datarray['term'] = $post_tags; $datarray['term'] = $post_tags;