diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2011-02-20 19:21:44 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2011-02-20 19:21:44 +0500 |
| commit | 1d46165b49103173069fd14c3b60b4d03bf9a5cf (patch) | |
| tree | c9bd74c6ac832b3d88a9b27a7d5b46fb1c911eaa | |
| parent | 58d70ee4d5a1eeeb67ea4b3573aadb56133d9ca2 (diff) | |
| parent | b40e6b9dd9f6012f9548dd75932e51433e011c2a (diff) | |
| download | prosody-1d46165b49103173069fd14c3b60b4d03bf9a5cf.tar.gz prosody-1d46165b49103173069fd14c3b60b4d03bf9a5cf.zip | |
Merge 0.8->trunk.
| -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 |