Software / code / prosody
Changeset
6744:79318d548465
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 25 Jun 2015 18:54:01 +0200 |
| parents | 6740:99b3f29c3c71 (current diff) 6743:adf2fdf1264a (diff) |
| children | 6745:6728ad041761 6746:5e8a8319699d |
| files | plugins/muc/mod_muc.lua |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/muc/mod_muc.lua Wed Jun 24 23:25:42 2015 +0100 +++ b/plugins/muc/mod_muc.lua Thu Jun 25 18:54:01 2015 +0200 @@ -60,7 +60,7 @@ 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
