aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_admin_telnet.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-10 13:15:11 +0200
committerKim Alvefur <zash@zash.se>2014-04-10 13:15:11 +0200
commitae8a4fb909a0cce10a12e9ced65e45ef2d1495fa (patch)
treeb842c0fb3552fbbaa03253af7cd869f0048753fa /plugins/mod_admin_telnet.lua
parente06966ee436e4d461b03aaf8691fe76dcd6d588b (diff)
parent1f74845db7945a874ef308a9fe32edce4b2ed7fc (diff)
downloadprosody-ae8a4fb909a0cce10a12e9ced65e45ef2d1495fa.tar.gz
prosody-ae8a4fb909a0cce10a12e9ced65e45ef2d1495fa.zip
Merge 0.9->0.10
Diffstat (limited to 'plugins/mod_admin_telnet.lua')
-rw-r--r--plugins/mod_admin_telnet.lua6
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;