aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2022-05-15 23:22:33 +0200
committerKim Alvefur <zash@zash.se>2022-05-15 23:22:33 +0200
commit7bc35fb961088137f7405a66e509c3d0e0bfc96d (patch)
tree27d78391206c7e4560ff3062159e98414c4e8bd0 /plugins
parent18baeca54aa5ad8b2f439dee7f17b810cff35bca (diff)
parentdc79c92cbc4ece6e3709c4954b65d5c97fd1acc5 (diff)
downloadprosody-7bc35fb961088137f7405a66e509c3d0e0bfc96d.tar.gz
prosody-7bc35fb961088137f7405a66e509c3d0e0bfc96d.zip
Merge 0.12->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_admin_shell.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_admin_shell.lua b/plugins/mod_admin_shell.lua
index c60cc75b..363ad5c6 100644
--- a/plugins/mod_admin_shell.lua
+++ b/plugins/mod_admin_shell.lua
@@ -50,12 +50,12 @@ local function capitalize(s)
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