Software / code / prosody
Changeset
5108:022123451e52
Merge 0.9->trunk
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Tue, 28 Aug 2012 05:12:25 +0500 |
| parents | 5106:ab338242e0da (current diff) 5107:6ac790efecd3 (diff) |
| children | 5109:12fb961c8f27 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/util/datetime.lua Sun Aug 26 23:57:12 2012 +0100 +++ b/util/datetime.lua Tue Aug 28 05:12:25 2012 +0500 @@ -36,7 +36,7 @@ function parse(s) if s then local year, month, day, hour, min, sec, tzd; - year, month, day, hour, min, sec, tzd = s:match("^(%d%d%d%d)-?(%d%d)-?(%d%d)T(%d%d):(%d%d):(%d%d)%.?%d*([Z+%-].*)$"); + year, month, day, hour, min, sec, tzd = s:match("^(%d%d%d%d)%-?(%d%d)%-?(%d%d)T(%d%d):(%d%d):(%d%d)%.?%d*([Z+%-]?.*)$"); if year then local time_offset = os_difftime(os_time(os_date("*t")), os_time(os_date("!*t"))); -- to deal with local timezone local tzd_offset = 0;
