diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-11-17 17:04:04 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-11-17 17:04:04 +0000 |
| commit | 3c75f782eddde40791ffab6e1156d1b7861adb00 (patch) | |
| tree | a8a6eb36805c334217159df4d836d0303b5cd111 /plugins | |
| parent | cb6f7a82c99c6956c5cd44f35d603343aa4c17db (diff) | |
| parent | 1bb13d90dded966c20d69af42ad1928c01b82332 (diff) | |
| download | prosody-3c75f782eddde40791ffab6e1156d1b7861adb00.tar.gz prosody-3c75f782eddde40791ffab6e1156d1b7861adb00.zip | |
Merge 0.9->0.10
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/muc/muc.lib.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index c32da338..48231c37 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -361,7 +361,7 @@ local function construct_stanza_id(room, stanza) end local function deconstruct_stanza_id(room, stanza) local from_jid_possiblybare, to_nick = stanza.attr.from, stanza.attr.to; - local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(.+)%z(.*)%z(.+)$"); + local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(%Z+)%z(%Z*)%z(.+)$"); local from_nick = room._jid_nick[from_jid]; if not(from_nick) then return; end |