aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_pubsub/mod_pubsub.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-05-06 19:21:29 +0100
committerMatthew Wild <mwild1@gmail.com>2015-05-06 19:21:29 +0100
commita540d613cd08b8feee096d19b727d1f5b2cab507 (patch)
treeac1899833b30b87ea97439f061e9b892bd188367 /plugins/mod_pubsub/mod_pubsub.lua
parent8b320cb39f3d22c7af46d33ddfc017a726db30d0 (diff)
parent80bafb72003774e5eb63ef9d3d7960385cfb8c6a (diff)
downloadprosody-a540d613cd08b8feee096d19b727d1f5b2cab507.tar.gz
prosody-a540d613cd08b8feee096d19b727d1f5b2cab507.zip
Merge
Diffstat (limited to 'plugins/mod_pubsub/mod_pubsub.lua')
-rw-r--r--plugins/mod_pubsub/mod_pubsub.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/mod_pubsub/mod_pubsub.lua b/plugins/mod_pubsub/mod_pubsub.lua
index de027b58..40c28d27 100644
--- a/plugins/mod_pubsub/mod_pubsub.lua
+++ b/plugins/mod_pubsub/mod_pubsub.lua
@@ -125,11 +125,15 @@ module:hook("host-disco-items", function (event)
end);
local admin_aff = module:get_option_string("default_admin_affiliation", "owner");
-local function get_affiliation(jid)
+local unowned_aff = module:get_option_string("default_unowned_affiliation");
+local function get_affiliation(jid, node)
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)