# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1364478663 14400
# Node ID 4a3737f0ce9afd460e6451e0d0226eefd8a54d4c
# Parent  9adde79c52b9d374700689e73ccf678090606ecc# Parent  ed55a48270be38c5935afb6da1577633935951fd
Merge 0.9->trunk

diff -r 9adde79c52b9 -r 4a3737f0ce9a plugins/muc/muc.lib.lua
--- 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