Software /
code /
prosody
Diff
plugins/mod_admin_telnet.lua @ 6067:dab7ad6fa23c
Merge 0.9->0.10
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Thu, 10 Apr 2014 13:15:11 +0200 |
parent | 6017:ac0879a8190a |
parent | 6064:c4a3222165c4 |
child | 6169:cb15eac75b50 |
line wrap: on
line diff
--- a/plugins/mod_admin_telnet.lua Thu Apr 10 13:13:07 2014 +0200 +++ b/plugins/mod_admin_telnet.lua Thu Apr 10 13:15:11 2014 +0200 @@ -896,6 +896,9 @@ function def_env.muc:create(room_jid) local room, host = check_muc(room_jid); + if not room_name then + return room_name, host; + end 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); @@ -903,6 +906,9 @@ function def_env.muc:room(room_jid) local room_name, host = check_muc(room_jid); + if not room_name then + return room_name, host; + end local room_obj = hosts[host].modules.muc.rooms[room_jid]; if not room_obj then return nil, "No such room: "..room_jid;