diff options
| -rwxr-xr-x | boot.php | 2 | ||||
| -rwxr-xr-x | mod/events.php | 6 | ||||
| -rwxr-xr-x | view/event_form.tpl | 1 |
3 files changed, 5 insertions, 4 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1234' ); +define ( 'FRIENDICA_VERSION', '2.3.1235' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1116 ); diff --git a/mod/events.php b/mod/events.php index 660a92df0..5da8f17fc 100755 --- a/mod/events.php +++ b/mod/events.php @@ -279,9 +279,9 @@ function events_content(&$a) { $sdt = ((x($orig_event)) ? $orig_event['start'] : 'now'); $fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now'); - $tz = ((x($orig_event) && $orig_event['adjust']) ? date_default_timezone_get() : 'UTC'); - - + $tz = date_default_timezone_get(); + if(x($orig_event)) + $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC'); $syear = datetime_convert('UTC', $tz, $sdt, 'Y'); $smonth = datetime_convert('UTC', $tz, $sdt, 'm'); diff --git a/view/event_form.tpl b/view/event_form.tpl index 5f3510bef..6de471aca 100755 --- a/view/event_form.tpl +++ b/view/event_form.tpl @@ -38,6 +38,7 @@ $f_dsel $f_tsel $acl +<div class="clear"></div> <input id="event-submit" type="submit" name="submit" value="$submit" /> </form> |