Fixes #4012 when using a timestamp with input/date, return UTC time rather than local...

diff --git a/js/lib/ui.js b/js/lib/ui.js
index 166ca16bcd6eaf5d5dc3f70187dbc477389dd1fd..6cc1bc78ac329886e51652eabcce7ea431635ce0 100644 (file)
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -267,8 +267,8 @@ elgg.ui.initDatePicker = function() {
                onSelect: function(dateText) {
                        if ($(this).is('.elgg-input-timestamp')) {
                                // convert to unix timestamp
-                               var date = $.datepicker.parseDate('yy-mm-dd', dateText);
-                               var timestamp = $.datepicker.formatDate('@', date);
+                               var dateParts = dateText.split("-");
+                               var timestamp = Date.UTC(dateParts[0], dateParts[1] - 1, dateParts[2]);
                                timestamp = timestamp / 1000;
 
                                var id = $(this).attr('id');

diff --git a/views/default/input/date.php b/views/default/input/date.php
index 35a951a0bf416e1f129a3312a21897468a0f2b68..ceeb2105ca3f71574120823a9b35d50fdb9f3747 100644 (file)
--- a/views/default/input/date.php
+++ b/views/default/input/date.php
@@ -44,6 +44,7 @@ if ($timestamp) {
        $vars['class'] = "{$vars['class']} elgg-input-timestamp";
        $vars['id'] = $vars['name'];
        unset($vars['name']);
+       unset($vars['internalname']);
 }
 
 // convert timestamps to text for display