From dea96b9f6ed6ca6149443186ab80f2a54ea9540d Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 11 Nov 2009 17:32:06 +0000 Subject: [PATCH] Fix: uniformize code Fix: bug --- htdocs/cashdesk/affIndex.php | 2 ++ htdocs/cashdesk/include/environnement.php | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php index e296b55dfd6..ea0f27ae0e0 100644 --- a/htdocs/cashdesk/affIndex.php +++ b/htdocs/cashdesk/affIndex.php @@ -52,6 +52,8 @@ print ''."\n"; print ''."\n"; +if (!empty($error)) print $error; + print '
'."\n"; print '
'."\n"; print '
'."\n"; diff --git a/htdocs/cashdesk/include/environnement.php b/htdocs/cashdesk/include/environnement.php index cdc13e67dca..60dda7f948d 100644 --- a/htdocs/cashdesk/include/environnement.php +++ b/htdocs/cashdesk/include/environnement.php @@ -66,10 +66,4 @@ if ($conf->stock->enabled && empty($conf_fkentrepot)) $conf_taille_listes = 200; // Nombre max de lignes a afficher dans les listes $conf_nbr_car_listes = 60; // Nombre max de caracteres par ligne dans les listes -//$new_conf_db_type=$conf_db_type; -//if (preg_match('/mysql/i',$new_conf_db_type)) $new_conf_db_type='Mysql'; -//require ('classes/'.$new_conf_db_type.'.class.php'); -//$sql = new Sql ($conf_db_host, $conf_db_user, $conf_db_pass, $conf_db_base); - -$sql=$db; ?>