X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Farray.lua;h=2d58e7fb72d623169faa0deeada3dac881154462;hb=ba0b5b929007fb47a7948cbd415aee5f6d4968a9;hp=5dc604ba71498adccff9a9eebedc96a6ea8712b2;hpb=a57e272f81fbc7429bc3ed823779a1f3e23202f6;p=prosody.git

diff --git a/util/array.lua b/util/array.lua
index 5dc604ba..2d58e7fb 100644
--- 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