diff options
| author | Kim Alvefur <zash@zash.se> | 2014-04-10 13:15:11 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-04-10 13:15:11 +0200 |
| commit | b9751f2455a3a7a72c2505d3fc8296ee722726cc (patch) | |
| tree | b842c0fb3552fbbaa03253af7cd869f0048753fa /plugins | |
| parent | 038d77554396739a50af3a3519c053d0b2b2276e (diff) | |
| parent | 51dce4916210eafee4bdccd6aa9461f2e8effc74 (diff) | |
| download | prosody-b9751f2455a3a7a72c2505d3fc8296ee722726cc.tar.gz prosody-b9751f2455a3a7a72c2505d3fc8296ee722726cc.zip | |
Merge 0.9->0.10
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_admin_telnet.lua | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index 2aa9bd9b..71dfa300 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -896,6 +896,9 @@ end 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 @@ end 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; |