From 7446bdadbf7840e7bdc71cd552b6dd1a64bd3b88 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 13 Mar 2008 14:09:42 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20r=E9gression=20temporaire=20afin=20de=20?=
=?UTF-8?q?r=E9gler=20le=20probl=E8me=20avec=20:=20Dolibarr=20setup=20is?=
=?UTF-8?q?=20not=20complete?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/master.inc.php | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 1e40d9c3145..4e620069ee6 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -60,11 +60,29 @@ else
error_reporting(E_ALL ^ E_NOTICE);
// Test si install ok
+/*
if (! isset($dolibarr_main_db_host))
{
print "Error: Dolibarr setup is not complete.\n";
exit;
}
+*/
+
+// R�gression temporaire
+if (! @include_once("conf/conf.php"))
+{
+ Header("Location: install/index.php");
+ exit;
+}
+else
+{
+ if (! isset($dolibarr_main_db_host))
+ {
+ Header("Location: install/index.php");
+ exit;
+ }
+}
+//Fin r�gression
if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql'
if (empty($dolibarr_main_data_root))
--
GitLab