diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-04-24 03:23:44 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-04-24 03:23:44 +0100 |
| commit | fc3a3c0b0c3a37017bc500e58b8dbdd4b39627c9 (patch) | |
| tree | aa0a50335206fc1fd058bae5dc77660b3044a929 /plugins/muc/mod_muc.lua | |
| parent | ae504e75dcc149a7dbafff6069804631e84b7a0e (diff) | |
| parent | 66d1101545dc3b6981ad2a7f45e6b719829d030e (diff) | |
| download | prosody-fc3a3c0b0c3a37017bc500e58b8dbdd4b39627c9.tar.gz prosody-fc3a3c0b0c3a37017bc500e58b8dbdd4b39627c9.zip | |
Merge with Markus K?tter
Diffstat (limited to 'plugins/muc/mod_muc.lua')
| -rw-r--r-- | plugins/muc/mod_muc.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua index 8ef7a5b3..43b8423d 100644 --- a/plugins/muc/mod_muc.lua +++ b/plugins/muc/mod_muc.lua @@ -69,10 +69,10 @@ for jid in pairs(persistent_rooms) do local node = jid_split(jid); local data = datamanager.load(node, muc_host, "config") or {}; local room = muc_new_room(jid, { - history_length = max_history_messages; + max_history_length = max_history_messages; }); room._data = data._data; - room._data.history_length = max_history_messages; --TODO: Need to allow per-room with a global limit + room._data.max_history_length = max_history_messages; -- Overwrite old max_history_length in data with current settings room._affiliations = data._affiliations; room.route_stanza = room_route_stanza; room.save = room_save; @@ -80,7 +80,7 @@ for jid in pairs(persistent_rooms) do end local host_room = muc_new_room(muc_host, { - history_length = max_history_messages; + max_history_length = max_history_messages; }); host_room.route_stanza = room_route_stanza; host_room.save = room_save; @@ -131,7 +131,7 @@ function stanza_handler(event) (restrict_room_creation == "admin" and is_admin(stanza.attr.from)) or (restrict_room_creation == "local" and select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")) then room = muc_new_room(bare, { - history_length = max_history_messages; + max_history_length = max_history_messages; }); room.route_stanza = room_route_stanza; room.save = room_save; |