aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-06-16 15:13:47 +0200
committerKim Alvefur <zash@zash.se>2015-06-16 15:13:47 +0200
commit37efc0dcf60fc34f896589af363d8b6f02866f08 (patch)
tree8b71fe5e23d05601453aaf9033fa3b0626cdd12d
parent835f4fbffc133104d90ff0c4382aef2605e60c1e (diff)
downloadprosody-37efc0dcf60fc34f896589af363d8b6f02866f08.tar.gz
prosody-37efc0dcf60fc34f896589af363d8b6f02866f08.zip
MUC: Remove half of monkeypatch that was supposed to make admins always be room owners, fixes #458
-rw-r--r--plugins/muc/mod_muc.lua5
1 files changed, 0 insertions, 5 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 6e86ab73..c932b0a4 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -44,16 +44,11 @@ local function is_admin(jid)
return um_is_admin(jid, module.host);
end
-local _set_affiliation = muc_new_room.room_mt.set_affiliation;
local _get_affiliation = muc_new_room.room_mt.get_affiliation;
function muclib.room_mt:get_affiliation(jid)
if is_admin(jid) then return "owner"; end
return _get_affiliation(self, jid);
end
-function muclib.room_mt:set_affiliation(actor, jid, affiliation, callback, reason)
- if is_admin(jid) then return nil, "modify", "not-acceptable"; end
- return _set_affiliation(self, actor, jid, affiliation, callback, reason);
-end
local function room_route_stanza(room, stanza) module:send(stanza); end
local function room_save(room, forced)