Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/projet/element.php
This commit is contained in:
Laurent Destailleur
2020-06-24 09:59:08 +02:00
parent 6d25b8630b 1762e10e69
commit b6c1cdad7c
5 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/modulebuilder/template/scripts/mymodule.php
View File

@@ -53,7 +53,10 @@ if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/master.i
if (!$res && file_exists("../master.inc.php")) $res = @include "../master.inc.php";
if (!$res && file_exists("../../master.inc.php")) $res = @include "../../master.inc.php";
if (!$res && file_exists("../../../master.inc.php")) $res = @include "../../../master.inc.php";
if (!$res) die("Include of master fails");
if (!$res) {
print "Include of master fails";
exit(-1);
}
// After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
// $user is created but empty.