diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-07-06 17:07:05 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-07-06 17:07:05 +0100 |
| commit | 855cb99f3c81b03fdeb27896d59ed9b66900ae02 (patch) | |
| tree | 116641904bf26766fe52624f4ef7af24d77ae2ee /plugins/muc | |
| parent | e6b0ecf2435c94405c08f5ffd7d595f0b75cc8a4 (diff) | |
| parent | 5292b8232a0cb961cc2d301556a179505ba98dee (diff) | |
| download | prosody-855cb99f3c81b03fdeb27896d59ed9b66900ae02.tar.gz prosody-855cb99f3c81b03fdeb27896d59ed9b66900ae02.zip | |
Merge with 0.10
Diffstat (limited to 'plugins/muc')
| -rw-r--r-- | plugins/muc/mod_muc.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua index c514bafd..69351504 100644 --- a/plugins/muc/mod_muc.lua +++ b/plugins/muc/mod_muc.lua @@ -60,7 +60,7 @@ function muclib.room_mt:get_affiliation(jid) 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 + if affiliation ~= "owner" and is_admin(jid) then return nil, "modify", "not-acceptable"; end return _set_affiliation(self, actor, jid, affiliation, callback, reason); end |