diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | include/datetime.php | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index 8a834f339..4018ced28 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1158,6 +1158,8 @@ function status_editor($a, $x, $popup = false) { $preview = ''; $defexpire = ((($z = get_pconfig($x['profile_uid'], 'system', 'default_post_expire')) && (! $webpage)) ? $z : ''); + if($defexpire) + $defexpire = datetime_convert('UTC',date_default_timezone_get(),$defexpire,'Y-m-d H:i'); $cipher = get_pconfig($x['profile_uid'], 'system', 'default_cipher'); if(! $cipher) diff --git a/include/datetime.php b/include/datetime.php index a387d84c4..5cab5889d 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -175,6 +175,8 @@ function timesel($format, $h, $m, $id='timepicker') { * set maximum date from picker with id $maxfrom (none by default) */ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '',$required = false) { + + // Once browser support is better this could probably be replaced with native HTML5 date picker $o = ''; |