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

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Browse Source 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
This commit is contained in:
Laurent Destailleur 2020-05-01 21:57:28 +02:00
commit 160009630f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/admin/tools/dolibarr_export.php
View File

@ -200,7 +200,6 @@ if (in_array($type, array('mysql', 'mysqli'))) {
print '<div class="formelementrow">'; print '<div class="formelementrow">';
print '<input type="checkbox" name="use_transaction" value="yes" id="checkbox_use_transaction" />'; print '<input type="checkbox" name="use_transaction" value="yes" id="checkbox_use_transaction" />';
print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>'; print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
print '</div>'; print '</div>';
if (! empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) { if (! empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {

7
htdocs/core/lib/files.lib.php
View File

@ -960,18 +960,18 @@ function dol_unescapefile($filename)
*/ */
function dolCheckVirus($src_file) function dolCheckVirus($src_file)
{ {
global $conf, $db; global $conf;
if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
{ {
if (!class_exists('AntiVir')) { if (!class_exists('AntiVir')) {
require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
} }
$antivir = new AntiVir($db); $antivir=new AntiVir($db);
$result = $antivir->dol_avscan_file($src_file); $result = $antivir->dol_avscan_file($src_file);
if ($result < 0) // If virus or error, we stop here if ($result < 0) // If virus or error, we stop here
{ {
$reterrors = $antivir->errors; $reterrors=$antivir->errors;
return $reterrors; return $reterrors;
} }
} }
@ -1848,6 +1848,7 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = ''
if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext; if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
$count = $image->getNumberImages(); $count = $image->getNumberImages();
if (! dol_is_file($fileoutput) || is_writeable($fileoutput)) if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
{ {
try { try {

2
htdocs/core/lib/sendings.lib.php
View File

@ -415,7 +415,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
//var_dump($expedition->linkedObjects); //var_dump($expedition->linkedObjects);
$receiving=''; $receiving='';
if (count($expedition->linkedObjects['delivery']) > 0) $receiving=reset($expedition->linkedObjects['delivery']); // Take first link if (!empty($expedition->linkedObjects['delivery'])) $receiving=reset($expedition->linkedObjects['delivery']); // Take first link
if (! empty($receiving)) if (! empty($receiving))
{ {