From 7ac5e467baa7ebc557ed3a07bdca7dc9ade0c1db Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 23 Nov 2019 23:11:03 +0100
Subject: core.modulemanager: Disable mod_vcard if mod_vcard_legacy is enabled
 to prevent conflict (#1469)

---
 core/modulemanager.lua | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'core')

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
 
-- 
cgit v1.2.3