Software / code / prosody
Changeset
8148:472219f85df6
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 18 May 2017 02:01:20 +0200 |
| parents | 8146:5c91fb62338e (current diff) 8147:d44c6582059d (diff) |
| children | 8150:4720f5ec4171 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/rostermanager.lua Wed May 17 01:06:20 2017 +0200 +++ b/core/rostermanager.lua Thu May 18 02:01:20 2017 +0200 @@ -329,7 +329,7 @@ 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)
