mod_c2s, mod_s2s: Log a message that stream encryption has been enabled with some...

[prosody.git] / util / array.lua

diff --git a/util/array.lua b/util/array.lua
index 5dc604ba71498adccff9a9eebedc96a6ea8712b2..2d58e7fb72d623169faa0deeada3dac881154462 100644 (file)
--- a/util/array.lua
+++ b/util/array.lua
@@ -17,9 +17,12 @@ local tostring = tostring;
 local array = {};
 local array_base = {};
 local array_methods = {};
-local array_mt = { __index = array_methods, __tostring = function (array) return array:concat(", "); end };
+local array_mt = { __index = array_methods, __tostring = function (array) return "{"..array:concat(", ").."}"; end };
 
-local function new_array(_, t)
+local function new_array(self, t, _s, _var)
+       if type(t) == "function" then -- Assume iterator
+               t = self.collect(t, _s, _var);
+       end
        return setmetatable(t or {}, array_mt);
 end