aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-10-18 22:47:26 +0200
committerKim Alvefur <zash@zash.se>2016-10-18 22:47:26 +0200
commitc9419f828036c5533b8eb22ee7385f845b7f3ae0 (patch)
treed4bfbcc575747c4128ddb26598b43c264bb98d42
parent5bbd2aa2ff4137e9dc7b47ee76723319cbfc75dc (diff)
downloadprosody-c9419f828036c5533b8eb22ee7385f845b7f3ae0.tar.gz
prosody-c9419f828036c5533b8eb22ee7385f845b7f3ae0.zip
Backed out changeset f1af4edd5722, doesn't work as intended (node is the name of the node and always present)
-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)