Browse Source

Fix first install on debian.

Laurent Destailleur 9 years ago
parent
commit
4c859999e8

+ 2 - 2
build/debian/patches/use-etc-dolibarr-conf.patch

@@ -34,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // Load conf file if it is already defined
 --- a/htdocs/support/inc.php
 +++ b/htdocs/support/inc.php
 @@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
@@ -47,4 +47,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // Load conf file if it is already defined

+ 2 - 1
htdocs/install/inc.php

@@ -77,7 +77,8 @@ $conffiletoshow = "htdocs/conf/conf.php";
 //$conffiletoshow = "/etc/dolibarr/conf.php";
 
 
-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
+// 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
     if ($result)

+ 2 - 1
htdocs/support/inc.php

@@ -62,7 +62,8 @@ $conffiletoshow = "htdocs/conf/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
 	if ($result)