aboutsummaryrefslogtreecommitdiffstats
path: root/core/modulemanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-11-23 23:11:03 +0100
committerKim Alvefur <zash@zash.se>2019-11-23 23:11:03 +0100
commit7ac5e467baa7ebc557ed3a07bdca7dc9ade0c1db (patch)
tree1710b2966656ecfc8dd9b9a33ffd59156654f777 /core/modulemanager.lua
parent290f9285592775374e7e1bbee7fefdc5919b9cca (diff)
downloadprosody-7ac5e467baa7ebc557ed3a07bdca7dc9ade0c1db.tar.gz
prosody-7ac5e467baa7ebc557ed3a07bdca7dc9ade0c1db.zip
core.modulemanager: Disable mod_vcard if mod_vcard_legacy is enabled to prevent conflict (#1469)
Diffstat (limited to 'core/modulemanager.lua')
-rw-r--r--core/modulemanager.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 17602459..a824d36a 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