aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-05-20 09:41:27 +0100
committerMatthew Wild <mwild1@gmail.com>2010-05-20 09:41:27 +0100
commit73f5f90003e011e3da0836a596ba5534469adef5 (patch)
treeac3288eee86f7542c56d9ed195a5a2ca38b52c23
parent226d0936b3ede43be6319474a9eb905dbe8fbc60 (diff)
parent5c7c2e522d9683eef84b03d40209361f4171b39c (diff)
downloadprosody-73f5f90003e011e3da0836a596ba5534469adef5.tar.gz
prosody-73f5f90003e011e3da0836a596ba5534469adef5.zip
Merge 0.7->trunk
-rw-r--r--plugins/mod_groups.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/mod_groups.lua b/plugins/mod_groups.lua
index d4604b1e..de7b8302 100644
--- a/plugins/mod_groups.lua
+++ b/plugins/mod_groups.lua
@@ -18,7 +18,7 @@ local jid_bare, jid_prep = jid.bare, jid.prep;
local module_host = module:get_host();
function inject_roster_contacts(username, host, roster)
- module:log("warn", "Injecting group members to roster");
+ --module:log("debug", "Injecting group members to roster");
local bare_jid = username.."@"..host;
if not members[bare_jid] and not members[false] then return; end -- Not a member of any groups
@@ -41,7 +41,7 @@ function inject_roster_contacts(username, host, roster)
-- Find groups this JID is a member of
if members[bare_jid] then
for _, group_name in ipairs(members[bare_jid]) do
- module:log("debug", "Importing group %s", group_name);
+ --module:log("debug", "Importing group %s", group_name);
import_jids_to_roster(group_name);
end
end
@@ -49,7 +49,7 @@ function inject_roster_contacts(username, host, roster)
-- Import public groups
if members[false] then
for _, group_name in ipairs(members[false]) do
- module:log("debug", "Importing group %s", group_name);
+ --module:log("debug", "Importing group %s", group_name);
import_jids_to_roster(group_name);
end
end