diff options
| author | Kim Alvefur <zash@zash.se> | 2016-11-05 00:28:30 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-11-05 00:28:30 +0100 |
| commit | beb642888ec3e3c27d96f6e4cf969033b8495d8e (patch) | |
| tree | ead046279a47ea5984c334f0c6500d85f5970dc8 /plugins/mod_pubsub | |
| parent | 02a841a72eb0e02a1f5091d0a23e10bf78ee368c (diff) | |
| parent | 500d7efbf490f85cb88449f6e28bc8b4162bea14 (diff) | |
| download | prosody-beb642888ec3e3c27d96f6e4cf969033b8495d8e.tar.gz prosody-beb642888ec3e3c27d96f6e4cf969033b8495d8e.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_pubsub')
| -rw-r--r-- | plugins/mod_pubsub/mod_pubsub.lua | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/plugins/mod_pubsub/mod_pubsub.lua b/plugins/mod_pubsub/mod_pubsub.lua index e93a5238..2b878ed8 100644 --- a/plugins/mod_pubsub/mod_pubsub.lua +++ b/plugins/mod_pubsub/mod_pubsub.lua @@ -126,15 +126,11 @@ module:hook("host-disco-items", function (event) 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) |