aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-07-21 13:22:48 +0100
committerMatthew Wild <mwild1@gmail.com>2009-07-21 13:22:48 +0100
commit9e90e4ab66bf6e8aff989e94f6827ee54ee9bfcc (patch)
tree0bfe17df34c4eab82cf3006c3408750ddb496032 /util
parentb95a1a48f4abb2a14dbbd55d5bfbdd0350f31e1c (diff)
parent015da9826919e388682ae891436220ca9e790d7b (diff)
downloadprosody-9e90e4ab66bf6e8aff989e94f6827ee54ee9bfcc.tar.gz
prosody-9e90e4ab66bf6e8aff989e94f6827ee54ee9bfcc.zip
Merge with 0.5
Diffstat (limited to 'util')
-rw-r--r--util/muc.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/muc.lua b/util/muc.lua
index b0fc8c84..b3673f63 100644
--- a/util/muc.lua
+++ b/util/muc.lua
@@ -159,7 +159,7 @@ local function room_send_history(room, to)
end
end
if room._data['subject'] then
- room:route_stanza(st.message({type='groupchat', from=room, to=to}):tag("subject"):text(room._data['subject']));
+ room:route_stanza(st.message({type='groupchat', from=room.jid, to=to}):tag("subject"):text(room._data['subject']));
end
end