mirror of
https://github.com/bjc/prosody.git
synced 2025-04-04 05:37:39 +03:00
Merge 0.12->trunk
This commit is contained in:
commit
6114ccee11
2 changed files with 2 additions and 2 deletions
|
@ -141,7 +141,7 @@ local function from_stanza(stanza, context, source)
|
|||
local error_tag = stanza:get_child("error");
|
||||
context = context or {};
|
||||
context.stanza = stanza;
|
||||
context.by = error_tag.attr.by or stanza.attr.from;
|
||||
context.by = error_tag and error_tag.attr.by or stanza.attr.from;
|
||||
|
||||
local uri;
|
||||
if condition == "gone" or condition == "redirect" then
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue