new event current date off by one, submit button misplaced

diff --git a/boot.php b/boot.php
index 554cdf27c546ada5c5376f2a40d61dd9a343835b..e1850fe296d4ffb4cdde7fd6c440215412f674f9 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -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 660a92df044cd3208b77c0f6eb9d0e8cece025b3..5da8f17fc2f5dea40da16f1608892632d2e2fed3 100755 (executable)
--- 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 5f3510bef8ea5d5c689a37a4b2286a63434dc76f..6de471acaa114aa67daae33943a7f6ee41e2771f 100755 (executable)
--- 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>