diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:26:53 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:26:53 +0100 |
| commit | daec51c435ca77914271200607841d55ff7408d7 (patch) | |
| tree | 15f1682fbc9c2ea904651bcc59e99d2397b0d4a8 /plugins/mod_pubsub | |
| parent | ba96c2f7db5ce079d7609dff90591b9872ba6143 (diff) | |
| parent | a540d613cd08b8feee096d19b727d1f5b2cab507 (diff) | |
| download | prosody-daec51c435ca77914271200607841d55ff7408d7.tar.gz prosody-daec51c435ca77914271200607841d55ff7408d7.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_pubsub')
| -rw-r--r-- | plugins/mod_pubsub/mod_pubsub.lua | 6 |
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) |