aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-02-05 00:04:11 +0000
committerMatthew Wild <mwild1@gmail.com>2016-02-05 00:04:11 +0000
commit62e7b282ea4f6e72990d839bf7f26307ccb3a61c (patch)
treea3336425edbdcdc8ad540dc565daac709882207b /plugins
parent00594e00a27c5172e9e5484e671427910f05cdd4 (diff)
parente2b370c6bf9d1495d9d180fb8713d3a5d774e0fd (diff)
downloadprosody-62e7b282ea4f6e72990d839bf7f26307ccb3a61c.tar.gz
prosody-62e7b282ea4f6e72990d839bf7f26307ccb3a61c.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_groups.lua4
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);