diff options
| author | Kim Alvefur <zash@zash.se> | 2023-04-19 11:42:36 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2023-04-19 11:42:36 +0200 |
| commit | 6114ccee1132f7165b65982d7056611482495d15 (patch) | |
| tree | 7035bba3898a7c9db4279de35a717b3e518b18da /util | |
| parent | 0d5af426ca380385d99cbc78a0bc9a40ff0e9890 (diff) | |
| parent | 57c37716145d1383e861c390c4953f41e81dfdb3 (diff) | |
| download | prosody-6114ccee1132f7165b65982d7056611482495d15.tar.gz prosody-6114ccee1132f7165b65982d7056611482495d15.zip | |
Merge 0.12->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/error.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/error.lua b/util/error.lua index da6d938c..64c742ae 100644 --- a/util/error.lua +++ b/util/error.lua @@ -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 |