diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-17 15:15:02 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-17 15:15:02 -0800 |
| commit | 96427a23a3523daf2c1966fe1b8a6e119e797e50 (patch) | |
| tree | a7aaea69271817bbc8f78396f0d98052ca52d3f3 /mod/events.php | |
| parent | bcaa32a83a965f111bfc2ba085a59857a4fa0c2d (diff) | |
| parent | e59f7cc198fb038cd8344c2d403b423d57300a96 (diff) | |
| download | volse-hubzilla-96427a23a3523daf2c1966fe1b8a6e119e797e50.tar.gz volse-hubzilla-96427a23a3523daf2c1966fe1b8a6e119e797e50.tar.bz2 volse-hubzilla-96427a23a3523daf2c1966fe1b8a6e119e797e50.zip | |
Merge branch 'master' of https://github.com/habeascodice/red
Diffstat (limited to 'mod/events.php')
| -rwxr-xr-x | mod/events.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mod/events.php b/mod/events.php index 009afbcb8..5af7d381e 100755 --- a/mod/events.php +++ b/mod/events.php @@ -268,8 +268,8 @@ function events_content(&$a) { if($mode == 'view') { - $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); - $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); + $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); + $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); if(! $y) $y = intval($thisyear); if(! $m) @@ -549,7 +549,6 @@ function events_content(&$a) { $tpl = get_markup_template('event_form.tpl'); - $o .= replace_macros($tpl,array( '$post' => $a->get_baseurl() . '/events', '$eid' => $eid, @@ -567,11 +566,11 @@ function events_content(&$a) { '$ftext' => $ftext, '$ModalCANCEL' => t('Cancel'), '$ModalOK' => t('OK'), - '$s_dsel' => datetimesel($f,mktime(),mktime(0,0,0,0,0,$syear+5),mktime($shour,$sminute,$ssecond,$smonth,$sday,$syear),'start_text'), + '$s_dsel' => datetimesel($f,new DateTime(),DateTime::createFromFormat('Y',$syear+5),DateTime::createFromFormat('Y-m-d H:i',"$syear-$smonth-$sday $shour:$sminute"),'start_text'), '$n_text' => t('Finish date/time is not known or not relevant'), '$n_checked' => $n_checked, '$f_text' => t('Event Finishes:'), - '$f_dsel' => datetimesel($f,mktime(),mktime(0,0,0,0,0,$fyear+5),mktime($fhour,$fminute,$fsecond,$fmonth,$fday,$fyear),'finish_text',true,true,'start_text'), + '$f_dsel' => datetimesel($f,new DateTime(),DateTime::createFromFormat('Y',$fyear+5),DateTime::createFromFormat('Y-m-d H:i',"$fyear-$fmonth-$fday $fhour:$fminute"),'finish_text',true,true,'start_text'), '$a_text' => t('Adjust for viewer timezone'), '$a_checked' => $a_checked, '$d_text' => t('Description:'), |