aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-11-17 17:12:45 +0000
committerMatthew Wild <mwild1@gmail.com>2015-11-17 17:12:45 +0000
commite4f2d5b6cd12d6f850ab39acb7a311efd9a2aaec (patch)
tree2dbe4eb578cb9b2bdffa5f395573b3f6d3a6ea39 /plugins
parent094164e5f0bf835e4fd1dcefa57f3bb4add8325d (diff)
parent3c75f782eddde40791ffab6e1156d1b7861adb00 (diff)
downloadprosody-e4f2d5b6cd12d6f850ab39acb7a311efd9a2aaec.tar.gz
prosody-e4f2d5b6cd12d6f850ab39acb7a311efd9a2aaec.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-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 7db463e5..b2f89972 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -546,7 +546,7 @@ function room_mt:handle_iq_to_occupant(origin, stanza)
if (type == "error" or type == "result") then
do -- deconstruct_stanza_id
if not occupant then return nil; end
- 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(.+)$");
if not(from == from_jid or from == jid_bare(from_jid)) then return nil; end
local from_occupant_jid = self:get_occupant_jid(from_jid);
if from_occupant_jid == nil then return nil; end