diff options
| author | Kim Alvefur <zash@zash.se> | 2015-06-25 18:54:01 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-06-25 18:54:01 +0200 |
| commit | b460e6d47f28382d21c8914abbd75c1b21b38158 (patch) | |
| tree | 49da0f0f354de33557646b8788fbd6e10cee2df8 | |
| parent | 988e97af844e0cfdf16fde8412fab52a1953d478 (diff) | |
| parent | b351da9b5f552145c3d9bab7a5e44b4c4936e78e (diff) | |
| download | prosody-b460e6d47f28382d21c8914abbd75c1b21b38158.tar.gz prosody-b460e6d47f28382d21c8914abbd75c1b21b38158.zip | |
Merge 0.9->0.10
| -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 |