diff options
| author | Kim Alvefur <zash@zash.se> | 2016-01-10 03:57:17 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-01-10 03:57:17 +0100 |
| commit | 1df83ddc8cdb6a93f4b736f461cec71084bbf095 (patch) | |
| tree | 64202f4daef595ff51640c1810fbb2751775faa4 /core | |
| parent | 8cdd08825d3ab4afddc12ddf75dc9af1924e8518 (diff) | |
| parent | 0d98ccd02a37153aef1cbfb71ba9c103d43fbda7 (diff) | |
| download | prosody-1df83ddc8cdb6a93f4b736f461cec71084bbf095.tar.gz prosody-1df83ddc8cdb6a93f4b736f461cec71084bbf095.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/rostermanager.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/rostermanager.lua b/core/rostermanager.lua index f196ccf3..0b72d0a6 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -300,17 +300,17 @@ local function unsubscribed(username, host, jid) if pending then roster[false].pending[jid] = nil; end - local subscribed; + local is_subscribed; if item then if item.subscription == "from" then item.subscription = "none"; - subscribed = true; + is_subscribed = true; elseif item.subscription == "both" then item.subscription = "to"; - subscribed = true; + is_subscribed = true; end end - local success = (pending or subscribed) and save_roster(username, host, roster); + local success = (pending or is_subscribed) and save_roster(username, host, roster); return success, pending, subscribed; end |