aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-05-18 02:01:20 +0200
committerKim Alvefur <zash@zash.se>2017-05-18 02:01:20 +0200
commitcdb000e818930f9622ecf4bdacae7a9c6ca80a2f (patch)
tree25f6f21b26940f5d7ca24465b103c7b46f453fc3
parent9b9d6a9ba97ee9160fcd4d28e2509ca768d15de7 (diff)
parentc5fc8dc1c188d9cd1283aabb8848f975cac71d71 (diff)
downloadprosody-cdb000e818930f9622ecf4bdacae7a9c6ca80a2f.tar.gz
prosody-cdb000e818930f9622ecf4bdacae7a9c6ca80a2f.zip
Merge 0.10->trunk
-rw-r--r--core/rostermanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index dc60ccdf..c94482c4 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -329,7 +329,7 @@ local function unsubscribed(username, host, jid)
end
end
local success = (pending or is_subscribed) and save_roster(username, host, roster, jid);
- return success, pending, subscribed;
+ return success, pending, is_subscribed;
end
local function process_outbound_subscription_request(username, host, jid)