Software / code / prosody
Changeset
5631:78bc91f0d74b
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 26 May 2013 22:59:06 +0200 |
| parents | 5629:2427c81da16c (current diff) 5630:5f3c0b11aa88 (diff) |
| children | 5632:8a2456f1f117 |
| files | plugins/mod_admin_telnet.lua |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_admin_telnet.lua Sun May 26 16:02:01 2013 +0200 +++ b/plugins/mod_admin_telnet.lua Sun May 26 22:59:06 2013 +0200 @@ -940,6 +940,8 @@ function def_env.muc:create(room_jid) local room, host = check_muc(room_jid); + if not room then return nil, host end + if hosts[host].modules.muc.rooms[room_jid] then return nil, "Room exists already" end return hosts[host].modules.muc.create_room(room_jid); end
