diff options
| author | Kim Alvefur <zash@zash.se> | 2013-05-26 22:59:06 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-05-26 22:59:06 +0200 |
| commit | bc17d8f64fae69b01a5b27509dffaba8748ce945 (patch) | |
| tree | df0a0b0399c45ce7406755d83fcdaa8c7f24b116 | |
| parent | 3ec0f31581ee93e40f000e883ec0ad1a4e5b480c (diff) | |
| parent | a59ace83df2910acc183c64f8ee550c602b8dfa3 (diff) | |
| download | prosody-bc17d8f64fae69b01a5b27509dffaba8748ce945.tar.gz prosody-bc17d8f64fae69b01a5b27509dffaba8748ce945.zip | |
Merge 0.9->trunk
| -rw-r--r-- | plugins/mod_admin_telnet.lua | 2 |
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 |