diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2013-05-12 04:12:24 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2013-05-12 04:12:24 +0200 |
| commit | 6e662881a75e7edc212734235565c50415dd1198 (patch) | |
| tree | f8f2df7a58b202b12907b796d16ad9a6dc7a2633 | |
| parent | 67697f6125466cc76ae07f2757afc7fef5db5e23 (diff) | |
| parent | 5bbcb92dce2be398dac702d40b2600b0830e3ec3 (diff) | |
Merge branch 'master' of /pub/repo.git/Baltisot
| -rw-r--r-- | lib/dblib.lua | 2 | ||||
| -rw-r--r-- | lib/httplib.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/dblib.lua b/lib/dblib.lua index 3840657..a48f065 100644 --- a/lib/dblib.lua +++ b/lib/dblib.lua @@ -623,7 +623,7 @@ END; end end if not bypass and not is_foreign and not t._.ddl[v] then - error("Trying to select a field which doesn't exist: " .. k .. " - inside of table " .. t._.tablename) + error("Trying to select a field which doesn't exist: " .. v .. " - inside of table " .. t._.tablename) end if not first then stmt = stmt .. ", " diff --git a/lib/httplib.lua b/lib/httplib.lua index 26d66bd..9642e11 100644 --- a/lib/httplib.lua +++ b/lib/httplib.lua @@ -59,7 +59,7 @@ function get_cookies(req) local k, v for k, v in pairs(cookie_strings) do - local cname, cvalue = string.match(v, "(%[^=]+)=(.+)") + local cname, cvalue = string.match(v, "([^=]+)=(.+)") if cname then cookies[trim(cname)] = trim(cvalue) end end end |