aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-12-09 15:37:10 +0100
committerKim Alvefur <zash@zash.se>2017-12-09 15:37:10 +0100
commit6e38411b1617de60d6e700aab4de874118863451 (patch)
treea6c2f9ac628c6de8ff6590139c1acbc5ab4797a0
parent5139d669fc8d8a2d25cdcbda9976031ed41ce644 (diff)
parentac1e8788440aa45d9145d56b71a3d73447d5aff9 (diff)
downloadprosody-6e38411b1617de60d6e700aab4de874118863451.tar.gz
prosody-6e38411b1617de60d6e700aab4de874118863451.zip
Merge 0.9->0.10
-rw-r--r--plugins/muc/muc.lib.lua4
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 53b4f682..807fb2c3 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -189,9 +189,7 @@ function room_mt:send_history(to, stanza)
end
end
function room_mt:send_subject(to)
- if self._data['subject'] then
- self:_route_stanza(st.message({type='groupchat', from=self._data['subject_from'] or self.jid, to=to}):tag("subject"):text(self._data['subject']));
- end
+ self:_route_stanza(st.message({type='groupchat', from=self._data['subject_from'] or self.jid, to=to}):tag("subject"):text(self._data['subject']));
end
function room_mt:get_disco_info(stanza)