diff --git a/include/class.ticket.php b/include/class.ticket.php index 79c56e77fe05dcc4fdbbec4f7dd6e309d41d0014..8f5dd5551bc713fa6d10bb8340806caf1f58317a 100644 --- a/include/class.ticket.php +++ b/include/class.ticket.php @@ -587,16 +587,22 @@ implements RestrictedAccess, Threadable { } function getUpdateInfo() { + global $cfg; + return array( 'source' => $this->getSource(), 'topicId' => $this->getTopicId(), 'slaId' => $this->getSLAId(), 'user_id' => $this->getOwnerId(), 'duedate' => $this->getDueDate() - ? Format::date($this->getDueDate()) + ? Format::date($this->getDueDate(), true, + $cfg->getDateFormat(true)) + : '', + 'time' => $this->getDueDate() + ? Format::time($this->getDueDate(), true, 'HH:mm') : '', - 'time' => $this->getDueDate()?(Format::date($this->getDueDate(), true, 'HH:mm')):'', ); + } function getLock() { diff --git a/scp/js/scp.js b/scp/js/scp.js index 2e6a116be5b998e44cf4ae812e2314c095cce14b..1e2dfa304ef14df52bd445a9bbb91e4797dc2b29 100644 --- a/scp/js/scp.js +++ b/scp/js/scp.js @@ -542,6 +542,7 @@ $.translate_format = function(str) { 'yyyy': '`', 'yyy': '`', 'yy': 'y', + 'y': 'yy', '`': 'yy' }; // Change PHP formats to datepicker ones