# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1652649753 -7200
# Node ID d04f6f01463601a6291783cd8d009edec8e26570
# Parent  c589874fe3489154628810592ff5d13ac9825d77# Parent  604bb5b8362d338130e8c8eb5933508025342501
Merge 0.12->trunk

diff -r c589874fe348 -r d04f6f014636 plugins/mod_admin_shell.lua
--- a/plugins/mod_admin_shell.lua	Sun May 15 16:12:34 2022 +0200
+++ b/plugins/mod_admin_shell.lua	Sun May 15 23:22:33 2022 +0200
@@ -50,12 +50,12 @@
 end
 
 local function pre(prefix, str, alt)
-	if (str or "") == "" then return alt or ""; end
+	if type(str) ~= "string" or str == "" then return alt or ""; end
 	return prefix .. str;
 end
 
 local function suf(str, suffix, alt)
-	if (str or "") == "" then return alt or ""; end
+	if type(str) ~= "string" or str == "" then return alt or ""; end
 	return str .. suffix;
 end