aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_pubsub/mod_pubsub.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-05 00:28:30 +0100
committerKim Alvefur <zash@zash.se>2016-11-05 00:28:30 +0100
commit07da428d332ef485dc4aea2f14cde5642fb0ba78 (patch)
treeead046279a47ea5984c334f0c6500d85f5970dc8 /plugins/mod_pubsub/mod_pubsub.lua
parent78fdfac11b141a83604a2887bb831206f71bef54 (diff)
parent02919f09518951d7561b8adbb843e88c6fc262ac (diff)
downloadprosody-07da428d332ef485dc4aea2f14cde5642fb0ba78.tar.gz
prosody-07da428d332ef485dc4aea2f14cde5642fb0ba78.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_pubsub/mod_pubsub.lua')
-rw-r--r--plugins/mod_pubsub/mod_pubsub.lua6
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)