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

Fix first install on debian.

Browse Source
This commit is contained in:
Laurent Destailleur 2016-02-06 17:19:57 +01:00
parent c6fe8e5479
commit 4c859999e8
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/debian/patches/use-etc-dolibarr-conf.patch
View File

@ -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/
+$conffiletoshow = "/etc/dolibarr/conf.php"; +$conffiletoshow = "/etc/dolibarr/conf.php";
if (! defined('DONOTLOADCONF') && file_exists($conffile)) // Load conf file if it is already defined

3
htdocs/install/inc.php
View File

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

3
htdocs/support/inc.php
View File

@ -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)