aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-05-26 22:59:06 +0200
committerKim Alvefur <zash@zash.se>2013-05-26 22:59:06 +0200
commit3050ac293682e300f7ed14deb1a0d6dca5ae3307 (patch)
treedf0a0b0399c45ce7406755d83fcdaa8c7f24b116
parentcc88321c964ed69fcd619af590b0faf28dd093ab (diff)
parent8072bfb662cdfb331c0d32dbc718751b7602f758 (diff)
downloadprosody-3050ac293682e300f7ed14deb1a0d6dca5ae3307.tar.gz
prosody-3050ac293682e300f7ed14deb1a0d6dca5ae3307.zip
Merge 0.9->trunk
-rw-r--r--plugins/mod_admin_telnet.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 1fd20543..3b8fedbd 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -940,6 +940,8 @@ end
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