diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-02-24 01:40:47 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-02-24 01:40:47 +0000 |
| commit | 3d829c1729e9462ddf3892554193536896e4c5f6 (patch) | |
| tree | 926fc5bda110ff63c50e0f0425042fb1549f4bc0 | |
| parent | 9d5e9921e6945b5dd7e0d70d8e340a74f018f574 (diff) | |
| parent | b40e6b9dd9f6012f9548dd75932e51433e011c2a (diff) | |
| download | prosody-3d829c1729e9462ddf3892554193536896e4c5f6.tar.gz prosody-3d829c1729e9462ddf3892554193536896e4c5f6.zip | |
Merge with waqas
| -rw-r--r-- | util/json.lua | 2 |
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 |