Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 28 Mar 2013 09:51:03 -0400
changeset 5398 4a3737f0ce9a
parent 5396 9adde79c52b9 (current diff)
parent 5397 ed55a48270be (diff)
child 5400 dd91b72a3ba0
Merge 0.9->trunk
--- a/plugins/muc/muc.lib.lua	Thu Mar 28 09:31:29 2013 -0400
+++ b/plugins/muc/muc.lib.lua	Thu Mar 28 09:51:03 2013 -0400
@@ -892,7 +892,7 @@
 					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
prosody