aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-05-24 00:35:08 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-05-24 00:35:08 +0500
commite1b4298fde007769a41c0a97fbfcc2f44bb383f9 (patch)
tree1297902fc9523c4ef6893718d90bcaf788106b43 /core
parent054a2d38c1ab12bf6bda2c22b775a91b9fb4dd4a (diff)
downloadprosody-e1b4298fde007769a41c0a97fbfcc2f44bb383f9.tar.gz
prosody-e1b4298fde007769a41c0a97fbfcc2f44bb383f9.zip
rostermanager: Return an error string when subscription test fails due to an error.
Diffstat (limited to 'core')
-rw-r--r--core/rostermanager.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 285cf4f6..506cf205 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -191,9 +191,9 @@ function process_inbound_unsubscribe(username, host, jid)
end
function is_contact_subscribed(username, host, jid)
- local roster = load_roster(username, host);
+ local roster, err = load_roster(username, host);
local item = roster[jid];
- return item and (item.subscription == "from" or item.subscription == "both");
+ return item and (item.subscription == "from" or item.subscription == "both"), err;
end
function is_contact_pending_in(username, host, jid)