aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-03-21 21:05:15 +0000
committerMatthew Wild <mwild1@gmail.com>2016-03-21 21:05:15 +0000
commit977314dc5ab03c9fb03ad59932b674a25f71ccff (patch)
tree77c0be62bfd2bafe4997921739e2ac005754d6d9
parent69b0605179de0b6ca719732d3d05e796816e0cad (diff)
parent6873a62f1eb02e211a579cc1e1aa52e37931dba3 (diff)
downloadprosody-977314dc5ab03c9fb03ad59932b674a25f71ccff.tar.gz
prosody-977314dc5ab03c9fb03ad59932b674a25f71ccff.zip
Merge 0.10->trunk
-rw-r--r--util/iterators.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/iterators.lua b/util/iterators.lua
index d453a694..e553229e 100644
--- a/util/iterators.lua
+++ b/util/iterators.lua
@@ -135,8 +135,8 @@ function it.filter(filter, f, s, var)
return function (_s, _var)
local ret;
repeat ret = pack(f(_s, _var));
- var = ret[1];
- until var == nil or filter(unpack(ret, 1, ret.n));
+ _var = ret[1];
+ until _var == nil or filter(unpack(ret, 1, ret.n));
return unpack(ret, 1, ret.n);
end, s, var;
end