diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-22 01:56:25 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-22 01:56:25 +0100 |
| commit | b5a5a91b133192aa625b0479259528867a280ea7 (patch) | |
| tree | c9bfd11304df67e0aa039c98ad2c59fbbb86081b /mod/events.php | |
| parent | 9ba1b8d7207c852e1cb323a25998065ca30b31a4 (diff) | |
| parent | 4c84a2ce615be12adfbeb1067b5c6652330027bb (diff) | |
| download | volse-hubzilla-b5a5a91b133192aa625b0479259528867a280ea7.tar.gz volse-hubzilla-b5a5a91b133192aa625b0479259528867a280ea7.tar.bz2 volse-hubzilla-b5a5a91b133192aa625b0479259528867a280ea7.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/events.php')
| -rwxr-xr-x | mod/events.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mod/events.php b/mod/events.php index af5a9fc66..7220a3d42 100755 --- a/mod/events.php +++ b/mod/events.php @@ -281,13 +281,14 @@ function events_content(&$a) { $first_day = get_pconfig(local_channel(),'system','cal_first_day'); + $first_day = (($first_day) ? $first_day : 0); $htpl = get_markup_template('event_head.tpl'); $a->page['htmlhead'] .= replace_macros($htpl,array( '$baseurl' => $a->get_baseurl(), '$editselect' => (($plaintext) ? 'none' : 'textareas'), '$lang' => $a->language, - '$first_day' => (($first_day) ? $first_day : 0) + '$first_day' => $first_day )); $o =""; @@ -692,11 +693,11 @@ function events_content(&$a) { '$required' => '<span class="required" title="' . t('Required') . '">*</span>', '$ModalCANCEL' => t('Cancel'), '$ModalOK' => t('OK'), - '$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',true,true,'','',true), + '$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',true,true,'','',true,$first_day), '$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,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'), + '$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','',false,$first_day), '$adjust' => array('adjust', t('Adjust for viewer timezone'), $a_checked, t('Important for events that happen in a particular place. Not practical for global holidays.'),), '$a_text' => t('Adjust for viewer timezone'), '$d_text' => t('Description:'), |