diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-02-05 00:04:11 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-02-05 00:04:11 +0000 |
commit | 9f2f783a50b33805c83b2e9a8f3e5784bec286ce (patch) | |
tree | a3336425edbdcdc8ad540dc565daac709882207b /plugins | |
parent | 60f27c0c88d9fcf80405d7653f9ffdf7a32dbd32 (diff) | |
parent | 7a87ef0b67fc74c7b55ed19dccf7bd66df4079ce (diff) | |
download | prosody-9f2f783a50b33805c83b2e9a8f3e5784bec286ce.tar.gz prosody-9f2f783a50b33805c83b2e9a8f3e5784bec286ce.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/mod_groups.lua | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/mod_groups.lua b/plugins/mod_groups.lua index be1a5508..d696d453 100644 --- a/plugins/mod_groups.lua +++ b/plugins/mod_groups.lua @@ -10,8 +10,6 @@ local groups; local members; -local groups_file; - local jid, datamanager = require "util.jid", require "util.datamanager"; local jid_prep = jid.prep; @@ -82,7 +80,7 @@ function remove_virtual_contacts(username, host, datastore, data) end function module.load() - groups_file = module:get_option_string("groups_file"); + local groups_file = module:get_option_path("groups_file", nil, "config"); if not groups_file then return; end module:hook("roster-load", inject_roster_contacts); |