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

Fix: Should remove warning

Browse Source
This commit is contained in:
Laurent Destailleur 2009-07-02 00:19:06 +00:00
parent d4b0cfdfb7
commit a464e34abd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/install/check.php
View File

@ -284,9 +284,8 @@ else
if (file_exists($conffile)) if (file_exists($conffile))
{ {
include_once($conffile); include_once($conffile);
if (! empty($dolibarr_main_db_type)) if (! empty($dolibarr_main_db_type) && ! empty($dolibarr_main_document_root))
{ {
// TODO message d'erreur sur fresh install lorsque conf.php existe et est vide, path invalide ($dolibarr_main_document_root)
require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php"); require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php");
require_once($dolibarr_main_document_root."/lib/admin.lib.php"); require_once($dolibarr_main_document_root."/lib/admin.lib.php");
// $conf is already instancied inside inc.php // $conf is already instancied inside inc.php
@ -310,9 +309,9 @@ else
{ {
if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption=0; if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption=0;
$conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption; $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 if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey='';
$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey; $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