Redo merge with Waqas' PBKDF2 optimizations.

[prosody.git] / util / array.lua

diff --git a/util/array.lua b/util/array.lua
index bbf26f3214ae4992beda62004503641df6ca04d4..686f55b1ef2f0b855039dc3cf89630b4388a708e 100644 (file)
--- a/util/array.lua
+++ b/util/array.lua
@@ -43,7 +43,7 @@ function array_base.filter(outa, ina, func)
                end
        end
        
-       if inplace and write < start_length then
+       if inplace and write <= start_length then
                for i=write,start_length do
                        outa[i] = nil;
                end
@@ -111,7 +111,6 @@ end
 
 -- Setup methods from array_base
 for method, f in pairs(array_base) do
-       local method = method; -- Yes, this is necessary :)
        local base_method = f;
        -- Setup global array method which makes new array
        array[method] = function (old_a, ...)