aboutsummaryrefslogtreecommitdiffstats
path: root/core/rostermanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-05 10:04:53 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-05 10:04:53 +0100
commita115da90578ef0e91e7fb911421142552a4e8e4a (patch)
tree60c4be5a40bd2c13dcfb8435083d1b23619523a4 /core/rostermanager.lua
parent4d922e9b7927109c5038ad8d3b6ccba38936a1f3 (diff)
parent3f35128dd3ce6922871ea45d1717ddc4708a1e8d (diff)
downloadprosody-a115da90578ef0e91e7fb911421142552a4e8e4a.tar.gz
prosody-a115da90578ef0e91e7fb911421142552a4e8e4a.zip
Merge with Maranda
Diffstat (limited to 'core/rostermanager.lua')
-rw-r--r--core/rostermanager.lua6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index f14bb435..5e06e3f7 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -18,6 +18,7 @@ local hosts = hosts;
local bare_sessions = bare_sessions;
local datamanager = require "util.datamanager"
+local um_user_exists = require "core.usermanager".user_exists;
local st = require "util.stanza";
module "rostermanager"
@@ -105,6 +106,11 @@ function load_roster(username, host)
end
function save_roster(username, host, roster)
+ if not um_user_exists(username, host) then
+ log("debug", "not saving roster for %s@%s: the user doesn't exist", username, host);
+ return nil;
+ end
+
log("debug", "save_roster: saving roster for %s@%s", username, host);
if not roster then
roster = hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster;