diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php index c4abadcd870d1..7ea6b5a890c02 100644 --- a/htdocs/core/modules/modWebsite.class.php +++ b/htdocs/core/modules/modWebsite.class.php @@ -164,6 +164,11 @@ public function init($options = '') { global $conf, $langs; + $result = $this->_load_tables('/install/mysql/tables/', 'website'); + if ($result < 0) { + return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default') + } + // Remove permissions and default values $this->remove($options); diff --git a/htdocs/install/mysql/tables/llx_website.key.sql b/htdocs/install/mysql/tables/llx_website-website.key.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_website.key.sql rename to htdocs/install/mysql/tables/llx_website-website.key.sql diff --git a/htdocs/install/mysql/tables/llx_website.sql b/htdocs/install/mysql/tables/llx_website-website.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_website.sql rename to htdocs/install/mysql/tables/llx_website-website.sql diff --git a/htdocs/install/mysql/tables/llx_website_extrafields.key.sql b/htdocs/install/mysql/tables/llx_website_extrafields-website.key.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_website_extrafields.key.sql rename to htdocs/install/mysql/tables/llx_website_extrafields-website.key.sql diff --git a/htdocs/install/mysql/tables/llx_website_extrafields.sql b/htdocs/install/mysql/tables/llx_website_extrafields-website.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_website_extrafields.sql rename to htdocs/install/mysql/tables/llx_website_extrafields-website.sql diff --git a/htdocs/install/mysql/tables/llx_website_page.key.sql b/htdocs/install/mysql/tables/llx_website_page-website.key.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_website_page.key.sql rename to htdocs/install/mysql/tables/llx_website_page-website.key.sql diff --git a/htdocs/install/mysql/tables/llx_website_page.sql b/htdocs/install/mysql/tables/llx_website_page-website.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_website_page.sql rename to htdocs/install/mysql/tables/llx_website_page-website.sql