Software / code / prosody
Changeset
8294:90576b60f2d0
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 05 Oct 2017 18:06:04 +0200 |
| parents | 8290:1ebe590c8849 (current diff) 8293:34814a908557 (diff) |
| children | 8295:8e82aa858ed2 |
| files | plugins/mod_storage_sql.lua |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_storage_sql.lua Wed Oct 04 12:10:55 2017 +0200 +++ b/plugins/mod_storage_sql.lua Thu Oct 05 18:06:04 2017 +0200 @@ -415,8 +415,8 @@ function driver:purge(username) return engine:transaction(function() - local stmt,err = engine:delete("DELETE FROM \"prosody\" WHERE \"host\"=? AND \"user\"=?", host, username); - return true, err; + engine:delete("DELETE FROM \"prosody\" WHERE \"host\"=? AND \"user\"=?", host, username); + engine:delete("DELETE FROM \"prosodyarchive\" WHERE \"host\"=? AND \"user\"=?", host, username); end); end
--- a/util-src/encodings.c Wed Oct 04 12:10:55 2017 +0200 +++ b/util-src/encodings.c Thu Oct 05 18:06:04 2017 +0200 @@ -216,7 +216,7 @@ */ const char *check_utf8(lua_State *L, int idx, size_t *l) { size_t pos, len; - const char *s = luaL_checklstring(L, 1, &len); + const char *s = luaL_checklstring(L, idx, &len); pos = 0; while(pos <= len) {
