Software / code / prosody
Changeset
13853:5611ce3bc54c
Merge 13.0->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 16 Apr 2025 18:27:46 +0200 |
| parents | 13850:0326e1338d73 (current diff) 13852:ce4b4c2863f3 (diff) |
| children | 13855:488483e1d915 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_invites.lua Wed Apr 16 12:03:08 2025 +0100 +++ b/plugins/mod_invites.lua Wed Apr 16 18:27:46 2025 +0200 @@ -221,7 +221,11 @@ -- Determine whether this type of invitation is supported by the landing page local invite_type; if invite.type == "register" then - invite_type = "account"; + if invite.additional_data and invite.additional_data.allow_reset then + invite_type = "password-reset"; + else + invite_type = "account"; + end elseif invite.type == "roster" then if invite.allow_registration then invite_type = "account-and-contact";
--- a/plugins/mod_storage_sql.lua Wed Apr 16 12:03:08 2025 +0100 +++ b/plugins/mod_storage_sql.lua Wed Apr 16 18:27:46 2025 +0200 @@ -879,7 +879,7 @@ local indices = {}; engine:transaction(function () if params.driver == "SQLite3" then - for row in engine:select [[SELECT "name" FROM "sqlite_schema" WHERE "type"='index' AND "tbl_name"='prosody' AND "name"='prosody_index';]] do + for row in engine:select [[SELECT "name" FROM "sqlite_schema" WHERE "type"='index' AND "tbl_name"='prosody';]] do indices[row[1]] = true; end elseif params.driver == "PostgreSQL" then
