diff options
| author | Kim Alvefur <zash@zash.se> | 2017-05-18 02:01:20 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-05-18 02:01:20 +0200 |
| commit | 5fab418c7297225df592a6118ea7054e05a3268f (patch) | |
| tree | 25f6f21b26940f5d7ca24465b103c7b46f453fc3 /core | |
| parent | 9cca72b5892f44ef7bd118c1ca3cf5f4f441c9f7 (diff) | |
| parent | 0ff70692d17e248804e485860a1e48f2771f0a79 (diff) | |
| download | prosody-5fab418c7297225df592a6118ea7054e05a3268f.tar.gz prosody-5fab418c7297225df592a6118ea7054e05a3268f.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/rostermanager.lua | 2 |
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) |