From d6eb99c42da3a12f182af3f2b4079460d1f54c24 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 7 Mar 2008 00:13:22 +0000 Subject: [PATCH] Fix: Removed old deprecated options --- htdocs/conf/conf.class.php | 3 --- mysql/migration/2.2.0-2.4.0.sql | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php index 102f1f232fe..0311726dcfb 100644 --- a/htdocs/conf/conf.class.php +++ b/htdocs/conf/conf.class.php @@ -352,9 +352,6 @@ class Conf if (empty($this->global->SOCIETE_CODECLIENT_ADDON)) $this->global->SOCIETE_CODECLIENT_ADDON="mod_codeclient_leopard"; if (empty($this->global->SOCIETE_CODEFOURNISSEUR_ADDON)) $this->global->SOCIETE_CODEFOURNISSEUR_ADDON=$this->global->SOCIETE_CODECLIENT_ADDON; if (empty($this->global->SOCIETE_CODECOMPTA_ADDON)) $this->global->SOCIETE_CODECOMPTA_ADDON="mod_codecompta_panicum"; - // Pour compatibilite ascendante: - if (isset($this->global->CODECLIENT_ADDON)) $this->global->SOCIETE_CODECLIENT_ADDON=$this->global->CODECLIENT_ADDON; - if (isset($this->global->CODEFOURNISSEUR_ADDON)) $this->global->SOCIETE_CODEFOURNISSEUR_ADDON=$this->global->CODEFOURNISSEUR_ADDON; // securite if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED='standard'; diff --git a/mysql/migration/2.2.0-2.4.0.sql b/mysql/migration/2.2.0-2.4.0.sql index edd01a9e5b2..ea09e70ae6b 100644 --- a/mysql/migration/2.2.0-2.4.0.sql +++ b/mysql/migration/2.2.0-2.4.0.sql @@ -18,6 +18,12 @@ update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_MONETARY' and update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_NUMERIC' and value='MAIN_FORCE_SETLOCALE_LC_NUMERIC'; update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_TIME' and value='MAIN_FORCE_SETLOCALE_LC_TIME'; +-- remove old deprecated options +update llx_const set name='SOCIETE_CODECLIENT_ADDON' where name='CODECLIENT_ADDON'; +update llx_const set name='SOCIETE_CODEFOURNISSEUR_ADDON' where name='CODEFOURNISSEUR_ADDON'; +delete from llx_const where name='CODECLIENT_ADDON'; +delete from llx_const where name='CODEFOURNISSEUR_ADDON'; + alter table llx_document_model modify type varchar(20) NOT NULL; DELETE FROM llx_rights_def WHERE module = 'menudb';