-- cgit v1.2.3 From 0372326fb1dd34e49ef2c614ef9d6a9e048328da Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 21 Jul 2009 13:19:37 +0100 Subject: mod_muc: Set correct 'from' JID when sending the room subject to joiners, fixes a traceback --- util/muc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 015da9826919e388682ae891436220ca9e790d7b Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 21 Jul 2009 13:21:52 +0100 Subject: pposix: Change LOG_EMERG -> LOG_CRIT, which makes more sense, thanks to intosi for reporting and an initial patch --- util-src/pposix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-src/pposix.c b/util-src/pposix.c index d26639b2..70c15281 100644 --- a/util-src/pposix.c +++ b/util-src/pposix.c @@ -173,7 +173,7 @@ int level_constants[] = { LOG_INFO, LOG_NOTICE, LOG_WARNING, - LOG_EMERG, + LOG_CRIT, -1 }; int lc_syslog_log(lua_State* L) -- cgit v1.2.3