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
commit253cf6e86d69a70909d221d36f8261770e1f3feb (patch)
treea6c2f9ac628c6de8ff6590139c1acbc5ab4797a0
parentfd533f1aaedfef09ea27d981e865cc67946510c7 (diff)
parentf535c57dd1b8d484da74686a75a83a763ba21be6 (diff)
downloadprosody-253cf6e86d69a70909d221d36f8261770e1f3feb.tar.gz
prosody-253cf6e86d69a70909d221d36f8261770e1f3feb.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)