diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-03-28 09:51:03 -0400 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-03-28 09:51:03 -0400 |
| commit | 03b2deeb6906deb9cf87dca0dcb0996510d20ea5 (patch) | |
| tree | 6e89afeabc71219c5c683df946478f89ff6dcd37 | |
| parent | f3a0d32fa9f7ce98757d20d39311fa1355b57eb9 (diff) | |
| parent | 1ffb32ffca4a61c4a30de7c528c4891517c39709 (diff) | |
| download | prosody-03b2deeb6906deb9cf87dca0dcb0996510d20ea5.tar.gz prosody-03b2deeb6906deb9cf87dca0dcb0996510d20ea5.zip | |
Merge 0.9->trunk
| -rw-r--r-- | plugins/muc/muc.lib.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 91b4792d..b6167a19 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -892,7 +892,7 @@ function room_mt:handle_to_room(origin, stanza) -- presence changes and groupcha origin.send(st.error_reply(stanza, "auth", "forbidden")); end else - self:broadcast_message(stanza, self:get_historylength() > 0); + self:broadcast_message(stanza, self:get_historylength() > 0 and stanza:get_child("body")); end stanza.attr.from = from; end |