Software /
code /
prosody
Diff
plugins/mod_pubsub/mod_pubsub.lua @ 7717:9c8eb0239eef
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Sat, 05 Nov 2016 00:28:30 +0100 |
parent | 6843:161cccfdf015 |
parent | 7708:c420a38db5ef |
child | 7982:e30b0cbed472 |
line wrap: on
line diff
--- a/plugins/mod_pubsub/mod_pubsub.lua Thu Oct 27 23:19:30 2016 +0200 +++ b/plugins/mod_pubsub/mod_pubsub.lua Sat Nov 05 00:28:30 2016 +0100 @@ -126,15 +126,11 @@ end); local admin_aff = module:get_option_string("default_admin_affiliation", "owner"); -local unowned_aff = module:get_option_string("default_unowned_affiliation"); -local function get_affiliation(jid, node) +local function get_affiliation(jid) local bare_jid = jid_bare(jid); if bare_jid == module.host or usermanager.is_admin(bare_jid, module.host) then return admin_aff; end - if not node then - return unowned_aff; - end end function set_service(new_service)