aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2010-10-12 23:34:16 +0200
committerKim Alvefur <zash@zash.se>2010-10-12 23:34:16 +0200
commitc894565b4bb4299b2ae1d0acb4559e563b3bcd02 (patch)
treee70c0ccef4ff4c9ce34b1d93552ba955716c6dc7
parent7d4005fc7de772f85b18662daaa18d9317600e8a (diff)
downloadprosody-c894565b4bb4299b2ae1d0acb4559e563b3bcd02.tar.gz
prosody-c894565b4bb4299b2ae1d0acb4559e563b3bcd02.zip
MUC: fix timezone support when sending history
-rw-r--r--plugins/muc/muc.lib.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index a3163349..785ebead 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -178,7 +178,7 @@ function room_mt:send_history(to, stanza)
if seconds then seconds = datetime.datetime(os.time() - math.floor(seconds)); end
local since = history_tag and history_tag.attr.since;
- if since and not since:match("^%d%d%d%d%-%d%d%-%d%dT%d%d:%d%d:%d%dZ$") then since = nil; end -- FIXME timezone support
+ if since then since = datetime.parse(since); since = since and datetime.datetime(since); end
if seconds and (not since or since < seconds) then since = seconds; end
local n = 0;