aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-03-28 09:31:29 -0400
committerMatthew Wild <mwild1@gmail.com>2013-03-28 09:31:29 -0400
commitceb0575c51ee05085440903414e02b6c986301a9 (patch)
treec3e4af12627509c8f4bffe9cb376b9338387ad19
parent0f44b53c15ed12d163902afaf93a88442d4c97d2 (diff)
parentff73782f9b19dd60f0e2b7bb13eb4a2959a29732 (diff)
downloadprosody-ceb0575c51ee05085440903414e02b6c986301a9.tar.gz
prosody-ceb0575c51ee05085440903414e02b6c986301a9.zip
Merge 0.9->trunk
-rw-r--r--util/json.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/util/json.lua b/util/json.lua
index efc602f0..abb87eab 100644
--- a/util/json.lua
+++ b/util/json.lua
@@ -148,6 +148,11 @@ function json.encode_ordered(obj)
simplesave(obj, t);
return t_concat(t);
end
+function json.encode_array(obj)
+ local t = {};
+ arraysave(obj, t);
+ return t_concat(t);
+end
-----------------------------------