lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: warning in install mode

Browse Source
This commit is contained in:
Regis Houssin 2009-06-30 09:21:29 +00:00
parent 61b7990852
commit 8a645cc421
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/html.formfile.class.php
View File

@ -18,14 +18,14 @@
/** /**
* \file htdocs/html.formfile.class.php * \file htdocs/html.formfile.class.php
* \brief Fichier de la classe des fonctions pr<EFBFBD>d<EFBFBD>finie de composants html fichiers * \brief Fichier de la classe des fonctions predefinie de composants html fichiers
* \version $Id$ * \version $Id$
*/ */
/** /**
* \class FormFile * \class FormFile
* \brief Classe permettant la g<EFBFBD>n<EFBFBD>ration de composants html fichiers * \brief Classe permettant la generation de composants html fichiers
*/ */
class FormFile class FormFile
{ {
@ -35,7 +35,7 @@ class FormFile
/** /**
* \brief Constructeur * \brief Constructeur
* \param DB handler d'acc<EFBFBD>s base de donn<EFBFBD>e * \param DB handler d'acces base de donnee
*/ */
function FormFile($DB) function FormFile($DB)
{ {

5
htdocs/install/check.php
View File

@ -307,6 +307,11 @@ else
# If a database access is available, we set more variable # If a database access is available, we set more variable
if ($ok) if ($ok)
{ {
if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption=0;
$conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey=''; // TODO la cle devra ne doit pas etre stockee sur le serveur
$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
$conf->setValues($db); $conf->setValues($db);
// Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE // Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE
// Version to install is DOL_VERSION // Version to install is DOL_VERSION