diff options
author | Kim Alvefur <zash@zash.se> | 2016-10-18 19:07:55 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-10-18 19:07:55 +0200 |
commit | f1c2f29484997c0a953a248241768df1c3736df5 (patch) | |
tree | a7bd7a664b80ac2d321bef9ef2e7a465e32982a5 /plugins | |
parent | da9ff7d218486105eb2e529cfe8e22346aa53430 (diff) | |
parent | 5bbd2aa2ff4137e9dc7b47ee76723319cbfc75dc (diff) | |
download | prosody-f1c2f29484997c0a953a248241768df1c3736df5.tar.gz prosody-f1c2f29484997c0a953a248241768df1c3736df5.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/mod_carbons.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_carbons.lua b/plugins/mod_carbons.lua index 951645f8..4d8175ef 100644 --- a/plugins/mod_carbons.lua +++ b/plugins/mod_carbons.lua @@ -26,7 +26,7 @@ local function message_handler(event, c2s) local orig_from = stanza.attr.from; local orig_to = stanza.attr.to; - if not(orig_type == "chat" or orig_type == "normal" and stanza:get_child("body")) then + if not(orig_type == "chat" or (orig_type == "normal" and stanza:get_child("body"))) then return -- Only chat type messages end |