aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-10-18 19:07:55 +0200
committerKim Alvefur <zash@zash.se>2016-10-18 19:07:55 +0200
commit0b21ca653d69a7b53f75c576b5902d8684c32e61 (patch)
treea7bd7a664b80ac2d321bef9ef2e7a465e32982a5 /plugins
parent98be2f263bd887a0f0f53a405f9d8f42d270a176 (diff)
parentde5e008d57702c1aeb196a718c045b0517ba631f (diff)
downloadprosody-0b21ca653d69a7b53f75c576b5902d8684c32e61.tar.gz
prosody-0b21ca653d69a7b53f75c576b5902d8684c32e61.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_carbons.lua2
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