aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-09 15:18:46 +0100
committerKim Alvefur <zash@zash.se>2016-01-09 15:18:46 +0100
commit986e6171b3cea117a86fa544b1cdbb750539437f (patch)
treedbc0fb6bb80eae526cef35590afba8781b03ac88 /core
parent9b4c1c40131ef343f5141242e134b18c45c2f128 (diff)
downloadprosody-986e6171b3cea117a86fa544b1cdbb750539437f.tar.gz
prosody-986e6171b3cea117a86fa544b1cdbb750539437f.zip
rostermanager: Rename variable to avoid name clash [luacheck]
Diffstat (limited to 'core')
-rw-r--r--core/rostermanager.lua8
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