diff options
| author |   Kim Alvefur <zash@zash.se> | 2019-11-23 23:11:03 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-11-23 23:11:03 +0100 |
| commit | 7ac5e467baa7ebc557ed3a07bdca7dc9ade0c1db (patch) | |
| tree | 1710b2966656ecfc8dd9b9a33ffd59156654f777 | |
| parent | prosodyctl check: Warn about conflict between mod_vcard and mod_vcard_legacy (#1469) (diff) | |
| download | prosody-7ac5e467baa7ebc557ed3a07bdca7dc9ade0c1db.tar.xz prosody-7ac5e467baa7ebc557ed3a07bdca7dc9ade0c1db.zip | |
core.modulemanager: Disable mod_vcard if mod_vcard_legacy is enabled to prevent conflict (#1469)
| -rw-r--r-- | core/modulemanager.lua | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index 176024599..a824d36aa 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -63,6 +63,11 @@ local function get_modules_for_host(host) modules:add("admin_telnet"); end + if modules:contains("vcard") and modules:contains("vcard_legacy") then + log("error", "The mod_vcard_legacy plugin replaces mod_vcard but both are enabled. Please update your config."); + modules:remove("vcard"); + end + return modules, component; end |