# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1744820866 -7200
# Node ID 5611ce3bc54c24d442bfd627174e25372190c778
# Parent  0326e1338d7375f907e0d3d30d1b06225e1363c6# Parent  ce4b4c2863f3e460ddd965359326b83115176760
Merge 13.0->trunk

diff -r 0326e1338d73 -r 5611ce3bc54c plugins/mod_invites.lua
--- 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";
diff -r 0326e1338d73 -r 5611ce3bc54c plugins/mod_storage_sql.lua
--- 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