From 1a2e3922f97c378d76a6304e75b9f458f23a3b41 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 1 Aug 2007 10:13:08 +0000 Subject: [PATCH] Fix: mauvais identifiant de global --- htdocs/master.inc.php | 10 +++++----- htdocs/product/ajaxproducts.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 0e1d73dceee..46dfa6527fc 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -112,17 +112,17 @@ $conf->db->user = $dolibarr_main_db_user; $conf->db->pass = $dolibarr_main_db_pass; if (! isset($dolibarr_main_db_type) && ! $dolibarr_main_db_type) $dolibarr_main_db_type='mysql'; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql' $conf->db->type = $dolibarr_main_db_type; -if (! isset($dolibarr_main_db_charset) && ! $dolibarr_main_db_charset) $dolibarr_main_db_charset='latin1'; -$conf->db->character_set=$dolibarr_main_db_charset; +if (! isset($dolibarr_main_db_character_set) && ! $dolibarr_main_db_character_set) $dolibarr_main_db_character_set='latin1'; +$conf->db->character_set=$dolibarr_main_db_character_set; if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_'; $conf->db->prefix = $dolibarr_main_db_prefix; -// Identifiant propre au client -if (! isset($character_set_client) || ! $character_set_client) $character_set_client='ISO-8859-1'; -$conf->db->character_set_client=$character_set_client; if (! isset($collation_connection) || ! $collation_connection) $collation_connection='latin1_swedish_ci'; $conf->db->collation_connection=$collation_connection; // Identifiant autres $conf->main_authentication = $dolibarr_main_authentication; +// Identifiant propre au client +if (! isset($character_set_client) || ! $character_set_client) $character_set_client='ISO-8859-1'; +$conf->character_set_client=$character_set_client; // Defini prefix if (isset($_SERVER["LLX_DBNAME"])) $dolibarr_main_db_prefix=$_SERVER["LLX_DBNAME"]; diff --git a/htdocs/product/ajaxproducts.php b/htdocs/product/ajaxproducts.php index f6c26ea5924..9a0c48d7bf9 100644 --- a/htdocs/product/ajaxproducts.php +++ b/htdocs/product/ajaxproducts.php @@ -32,7 +32,7 @@ require('../main.inc.php'); $langs->load("products"); $langs->load("main"); -//top_htmlhead("", "", 1); +top_htmlhead("", "", 1); print ''."\n";