Software / code / prosody
Comparison
core/modulemanager.lua @ 10433:7777f25d5266 0.11
core.modulemanager: Disable mod_vcard if mod_vcard_legacy is enabled to prevent conflict (#1469)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 23 Nov 2019 23:11:03 +0100 |
| parent | 9563:732314eb3258 |
| child | 10434:8f709577fe8e |
comparison
equal
deleted
inserted
replaced
| 10432:7b5a3de26f57 | 10433:7777f25d5266 |
|---|---|
| 59 -- COMPAT w/ pre 0.8 | 59 -- COMPAT w/ pre 0.8 |
| 60 if modules:contains("console") then | 60 if modules:contains("console") then |
| 61 log("error", "The mod_console plugin has been renamed to mod_admin_telnet. Please update your config."); | 61 log("error", "The mod_console plugin has been renamed to mod_admin_telnet. Please update your config."); |
| 62 modules:remove("console"); | 62 modules:remove("console"); |
| 63 modules:add("admin_telnet"); | 63 modules:add("admin_telnet"); |
| 64 end | |
| 65 | |
| 66 if modules:contains("vcard") and modules:contains("vcard_legacy") then | |
| 67 log("error", "The mod_vcard_legacy plugin replaces mod_vcard but both are enabled. Please update your config."); | |
| 68 modules:remove("vcard"); | |
| 64 end | 69 end |
| 65 | 70 |
| 66 return modules, component; | 71 return modules, component; |
| 67 end | 72 end |
| 68 | 73 |