aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-05-04 23:13:50 +0100
committerMatthew Wild <mwild1@gmail.com>2011-05-04 23:13:50 +0100
commitbe19c910e21a3893076aa907b3f978031a5e3fbf (patch)
tree93789b4c9c75989a753c0107b5aebd4154311b07
parent4f90add96022e865d02b38ef8dfc6bcd9f7f486f (diff)
parent69a4cd5a25e4368bcc162c28138cba1d4d920c86 (diff)
downloadprosody-be19c910e21a3893076aa907b3f978031a5e3fbf.tar.gz
prosody-be19c910e21a3893076aa907b3f978031a5e3fbf.zip
Merge 0.8->trunk
-rw-r--r--plugins/muc/mod_muc.lua3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 329b9270..ca2e6e20 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -58,6 +58,9 @@ local function room_save(room, forced)
room._data.history = history;
elseif forced then
datamanager.store(node, muc_host, "config", nil);
+ if not next(room._occupants) then -- Room empty
+ rooms[room.jid] = nil;
+ end
end
if forced then datamanager.store(nil, muc_host, "persistent", persistent_rooms); end
end