aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-11-22 02:36:10 +0100
committerKim Alvefur <zash@zash.se>2017-11-22 02:36:10 +0100
commit83c3e348f7b8e60d9cba766ea8de2ff482aed71f (patch)
treeb8924d939965bcf3ffbf9477eb4f73d16ca4b471
parentcbfe174fa4616d7a70fc1211cfa53c4d65555955 (diff)
parent70fbc5ba5818eeb9c5e1357306eaae31030d99f6 (diff)
downloadprosody-83c3e348f7b8e60d9cba766ea8de2ff482aed71f.tar.gz
prosody-83c3e348f7b8e60d9cba766ea8de2ff482aed71f.zip
Merge 0.10->trunk
-rw-r--r--util/helpers.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/helpers.lua b/util/helpers.lua
index eb38f653..02257ffa 100644
--- a/util/helpers.lua
+++ b/util/helpers.lua
@@ -50,7 +50,7 @@ local function show_events(events, specific_event)
local handler_strings = {};
for i, handler in ipairs(handlers) do
local upvals = debug.string_from_var_table(debug.get_upvalues_table(handler));
- handler_strings[i] = " "..priorities[handler]..": "..tostring(handler)..(upvals and ("\n "..upvals) or "");
+ handler_strings[i] = " "..(priorities[handler] or "?")..": "..tostring(handler)..(upvals and ("\n "..upvals) or "");
end
event_handler_arrays[event] = handler_strings;
end