diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:24:57 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:24:57 +0000 |
| commit | 85acc757991e3a425e8d8cab4611c7c321dc8425 (patch) | |
| tree | f7d0930c79494da535857eaf4f2a976bb052fa35 /plugins/mod_admin_telnet.lua | |
| parent | 25d886be280a1b6d9965b38cb22aa328354de0c2 (diff) | |
| parent | f3797f8dc8d711759fa4bf93a3a13f4dadbfdd7a (diff) | |
| download | prosody-85acc757991e3a425e8d8cab4611c7c321dc8425.tar.gz prosody-85acc757991e3a425e8d8cab4611c7c321dc8425.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_admin_telnet.lua')
| -rw-r--r-- | plugins/mod_admin_telnet.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index 0fe6d2ad..ee8a43dc 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -962,7 +962,7 @@ function def_env.muc:room(room_jid) if not room_name then return room_name, host; end - local room_obj = hosts[host].modules.muc.rooms[room_jid]; + local room_obj = hosts[host].modules.muc.get_room_from_jid(room_jid); if not room_obj then return nil, "No such room: "..room_jid; end @@ -976,8 +976,8 @@ function def_env.muc:list(host) end local print = self.session.print; local c = 0; - for name in keys(host_session.modules.muc.rooms) do - print(name); + for room in host_session.modules.muc.each_room() do + print(room.jid); c = c + 1; end return true, c.." rooms"; |