aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2022-10-24 15:25:12 +0200
committerKim Alvefur <zash@zash.se>2022-10-24 15:25:12 +0200
commitbd0e903b078f301e6f30ae16f13cca2ed7da012e (patch)
treed9b939db5aac4ddca571076054996790950e6e95
parent03814250c300b8cbaaccfde6bdb856039c3a4691 (diff)
parent20532df52592717027b1cb138da71abc8913ffbf (diff)
downloadprosody-bd0e903b078f301e6f30ae16f13cca2ed7da012e.tar.gz
prosody-bd0e903b078f301e6f30ae16f13cca2ed7da012e.zip
Merge 0.12->trunk
-rw-r--r--plugins/mod_admin_shell.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/mod_admin_shell.lua b/plugins/mod_admin_shell.lua
index 97464579..3eaa871a 100644
--- a/plugins/mod_admin_shell.lua
+++ b/plugins/mod_admin_shell.lua
@@ -780,7 +780,11 @@ available_columns = {
width = 5;
align = "right";
key = "conn";
- mapper = function(conn) return conn:serverport(); end;
+ mapper = function(conn)
+ if conn then
+ return conn:serverport();
+ end
+ end;
};
dir = {
title = "Dir";