aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-04-06 16:50:51 +0200
committerKim Alvefur <zash@zash.se>2018-04-06 16:50:51 +0200
commit0966771990f7fd5318b7efcb40f3f0ea20c810af (patch)
tree12415e4c6525bd8046bbf6d542af7000c98714e0
parent08ffe9fdb6d741ea90dadbf80e1c004f2ed401dc (diff)
downloadprosody-0966771990f7fd5318b7efcb40f3f0ea20c810af.tar.gz
prosody-0966771990f7fd5318b7efcb40f3f0ea20c810af.zip
util.startup: Fix traceback due to both plugin path becoming nil if plugin_paths is unset
-rw-r--r--util/startup.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/startup.lua b/util/startup.lua
index 93d91caf..a7ed333a 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -220,8 +220,8 @@ function startup.setup_plugindir()
-- path1;path2;path3;defaultpath...
-- luacheck: ignore 111
CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
+ prosody.paths.plugins = CFG_PLUGINDIR;
end
- prosody.paths.plugins = CFG_PLUGINDIR;
end
function startup.chdir()