Skip to content
Snippets Groups Projects
Commit 4c859999 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix first install on debian.

parent c6fe8e54
No related branches found
No related tags found
No related merge requests found
...@@ -34,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ...@@ -34,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+$conffiletoshow = "/etc/dolibarr/conf.php"; +$conffiletoshow = "/etc/dolibarr/conf.php";
if (! defined('DONOTLOADCONF') && file_exists($conffile)) // Load conf file if it is already defined
--- a/htdocs/support/inc.php --- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php +++ b/htdocs/support/inc.php
@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php"; @@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
...@@ -47,4 +47,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ...@@ -47,4 +47,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+$conffiletoshow = "/etc/dolibarr/conf.php"; +$conffiletoshow = "/etc/dolibarr/conf.php";
if (! defined('DONOTLOADCONF') && file_exists($conffile)) // Load conf file if it is already defined
...@@ -77,6 +77,7 @@ $conffiletoshow = "htdocs/conf/conf.php"; ...@@ -77,6 +77,7 @@ $conffiletoshow = "htdocs/conf/conf.php";
//$conffiletoshow = "/etc/dolibarr/conf.php"; //$conffiletoshow = "/etc/dolibarr/conf.php";
// Load conf file if it is already defined
if (! defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8) // Test on filesize is to ensure that conf file is more that an empty template with just <?php in first line if (! defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8) // Test on filesize is to ensure that conf file is more that an empty template with just <?php in first line
{ {
$result=include_once $conffile; // Load conf file $result=include_once $conffile; // Load conf file
......
...@@ -62,7 +62,8 @@ $conffiletoshow = "htdocs/conf/conf.php"; ...@@ -62,7 +62,8 @@ $conffiletoshow = "htdocs/conf/conf.php";
//$conffiletoshow = "/etc/dolibarr/conf.php"; //$conffiletoshow = "/etc/dolibarr/conf.php";
if (! defined('DONOTLOADCONF') && file_exists($conffile)) // Load conf file if it is already defined
if (! defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8) // Test on filesize is to ensure that conf file is more that an empty template with just <?php in first line
{ {
$result=include_once $conffile; // Load conf file $result=include_once $conffile; // Load conf file
if ($result) if ($result)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment