aboutsummaryrefslogtreecommitdiffstats
path: root/util
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
commitf3a0d32fa9f7ce98757d20d39311fa1355b57eb9 (patch)
treec3e4af12627509c8f4bffe9cb376b9338387ad19 /util
parent2bb354db7f21a35ddeb16cee161047919f944b71 (diff)
parent533a5899e3016d01a68048d2d2b05e861e5d4d51 (diff)
downloadprosody-f3a0d32fa9f7ce98757d20d39311fa1355b57eb9.tar.gz
prosody-f3a0d32fa9f7ce98757d20d39311fa1355b57eb9.zip
Merge 0.9->trunk
Diffstat (limited to 'util')
-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
-----------------------------------