aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2011-02-20 19:21:44 +0500
committerWaqas Hussain <waqas20@gmail.com>2011-02-20 19:21:44 +0500
commitb4ea2bdb35d10c2a925c2b4662e51f9e77f8598a (patch)
treec9bd74c6ac832b3d88a9b27a7d5b46fb1c911eaa
parentd833e47d79b3fa231f1a7e9cfb23b7a2773717f9 (diff)
parentb40e6b9dd9f6012f9548dd75932e51433e011c2a (diff)
downloadprosody-b4ea2bdb35d10c2a925c2b4662e51f9e77f8598a.tar.gz
prosody-b4ea2bdb35d10c2a925c2b4662e51f9e77f8598a.zip
Merge 0.8->trunk.
-rw-r--r--util/json.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/util/json.lua b/util/json.lua
index 40939bb4..05453703 100644
--- a/util/json.lua
+++ b/util/json.lua
@@ -268,7 +268,9 @@ function json.decode(json)
return tonumber(s);
end
local function readmember(t)
+ skipstuff();
local k = readstring();
+ skipstuff();
checkandskip(":");
t[k] = readvalue();
end