# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1681897356 -7200
# Node ID e7a5e5a0dc0233bf19fb8f686a46b64b7348db9f
# Parent  f4e33d17eaa8de302d371906b0cbba1b0e3e1c7f# Parent  6da83deb8d7f7a2921db69f06b8e50dabe3945e4
Merge 0.12->trunk

diff -r f4e33d17eaa8 -r e7a5e5a0dc02 plugins/mod_admin_shell.lua
--- a/plugins/mod_admin_shell.lua	Wed Apr 19 11:14:11 2023 +0200
+++ b/plugins/mod_admin_shell.lua	Wed Apr 19 11:42:36 2023 +0200
@@ -903,7 +903,7 @@
 		width = math.max(#"Expired", #"Self-signed", #"Untrusted", #"Mismatched", #"Unknown");
 		mapper = function(cert_status, session)
 			if cert_status then return capitalize(cert_status); end
-			if session.cert_chain_status == "Invalid" then
+			if session.cert_chain_status == "invalid" then
 				local cert_errors = set.new(session.cert_chain_errors[1]);
 				if cert_errors:contains("certificate has expired") then
 					return "Expired";
diff -r f4e33d17eaa8 -r e7a5e5a0dc02 util/error.lua
--- a/util/error.lua	Wed Apr 19 11:14:11 2023 +0200
+++ b/util/error.lua	Wed Apr 19 11:42:36 2023 +0200
@@ -141,7 +141,7 @@
 	local error_tag = stanza:get_child("error");
 	context = context or {};
 	context.stanza = stanza;
-	context.by = error_tag.attr.by or stanza.attr.from;
+	context.by = error_tag and error_tag.attr.by or stanza.attr.from;
 
 	local uri;
 	if condition == "gone" or condition == "redirect" then