aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-06-21 19:24:15 +0200
committerKim Alvefur <zash@zash.se>2020-06-21 19:24:15 +0200
commitbac049fb34fd1fabc580fc8df86b676809017648 (patch)
tree4762c48cdb12d2219deefec85b430db27ba9429c
parent93400f60fb40d8bf1b32977b76446d2e6fc78049 (diff)
parent28f0267645821b58d98288e91201f9f29095ebed (diff)
downloadprosody-bac049fb34fd1fabc580fc8df86b676809017648.tar.gz
prosody-bac049fb34fd1fabc580fc8df86b676809017648.zip
Merge 0.11->trunk
-rw-r--r--plugins/mod_muc_mam.lua3
1 files changed, 0 insertions, 3 deletions
diff --git a/plugins/mod_muc_mam.lua b/plugins/mod_muc_mam.lua
index 4bc43ec3..65794cf4 100644
--- a/plugins/mod_muc_mam.lua
+++ b/plugins/mod_muc_mam.lua
@@ -345,9 +345,6 @@ module:hook("muc-broadcast-message", function (event)
and jid_prep(tag.attr.by) == room.jid then
return nil;
end
- if tag.name == "x" and tag.attr.xmlns == xmlns_muc_user then
- return nil;
- end
return tag;
end);