From e3ab638262a338df9f31b351a47c430f9e067832 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 20 Nov 2016 12:03:24 +0100 Subject: util.datamanager: Use the 'base' argument to tonumber() to indicate hexadecimal --- util/datamanager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/datamanager.lua') diff --git a/util/datamanager.lua b/util/datamanager.lua index 2884b942..148605d9 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -50,7 +50,7 @@ local _ENV = nil; ---- utils ----- local encode, decode; do - local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end }); + local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber(k, 16)); return t[k]; end }); decode = function (s) return s and (s:gsub("+", " "):gsub("%%([a-fA-F0-9][a-fA-F0-9])", urlcodes)); -- cgit v1.2.3 From f0bd3ec40322b46444b6d944fce24e5beaaf0bf4 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 20 Nov 2016 12:05:43 +0100 Subject: util.datamanager: Remove extraneous decoding of + to space, which we never never encode to --- util/datamanager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/datamanager.lua') diff --git a/util/datamanager.lua b/util/datamanager.lua index 148605d9..ddc71899 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -53,7 +53,7 @@ do local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber(k, 16)); return t[k]; end }); decode = function (s) - return s and (s:gsub("+", " "):gsub("%%([a-fA-F0-9][a-fA-F0-9])", urlcodes)); + return s and (s:gsub("%%([a-fA-F0-9][a-fA-F0-9])", urlcodes)); end encode = function (s) -- cgit v1.2.3 From f36fed39e8110ee3c36e0587811ce3268ae6690e Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 20 Nov 2016 12:06:36 +0100 Subject: util.datamanager: Shorter pattern --- util/datamanager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/datamanager.lua') diff --git a/util/datamanager.lua b/util/datamanager.lua index ddc71899..585bb83d 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -53,7 +53,7 @@ do local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber(k, 16)); return t[k]; end }); decode = function (s) - return s and (s:gsub("%%([a-fA-F0-9][a-fA-F0-9])", urlcodes)); + return s and (s:gsub("%%(%x%x)", urlcodes)); end encode = function (s) -- cgit v1.2.3