# HG changeset patch # User Kim Alvefur # Date 1452349126 -3600 # Node ID b98006bfd97a5dfc796a28d631d7023bb18ea09b # Parent 90e8bbfbaabd7f8ca3bfb9a23f5b135db4d7dc01 rostermanager: Rename variable to avoid name clash [luacheck] diff -r 90e8bbfbaabd -r b98006bfd97a core/rostermanager.lua --- a/core/rostermanager.lua Fri Jan 08 16:20:02 2016 +0100 +++ b/core/rostermanager.lua Sat Jan 09 15:18:46 2016 +0100 @@ -300,17 +300,17 @@ 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