diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index d3da7ad8278..0bef19dde56 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -221,6 +221,7 @@ print '<tr '.$bc[false].'><td style="padding-left: 8px">';
 			<div class="formelementrow"><input type="checkbox"
 				name="use_transaction" value="yes" id="checkbox_use_transaction" /> <label
 				for="checkbox_use_transaction"> <?php echo $langs->trans("UseTransactionnalMode"); ?></label>
+
 			</div>
 
 			<?php if (! empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) { ?>
@@ -243,14 +244,6 @@ print '<tr '.$bc[false].'><td style="padding-left: 8px">';
 				<option value="ORACLE">ORACLE</option>
 				<option value="POSTGRESQL">POSTGRESQL</option>
 			</select> <br>
-				<input type="checkbox" name="use_mysql_quick_param" value="yes" id="checkbox_use_quick" />
-				<label for="checkbox_use_quick">
-					<?php echo $form->textwithpicto(
-						$langs->trans('ExportUseMySQLQuickParameter'),
-						$langs->trans('ExportUseMySQLQuickParameterHelp')
-					); ?>
-				</label>
-				<br/>
 			<!-- <input type="checkbox" name="drop_database" value="yes"
 				id="checkbox_drop_database" /> <label for="checkbox_drop_database"><?php echo $langs->trans("AddDropDatabase"); ?></label>
 			-->
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index dedd55d1a01..39c294c5cac 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -262,7 +262,6 @@ class Utils
 			if (GETPOST("disable_fk", "alpha") || $usedefault) $param.=" -K";
 			if (GETPOST("sql_compat", "alpha") && GETPOST("sql_compat", "alpha") != 'NONE') $param.=" --compatible=".escapeshellarg(GETPOST("sql_compat", "alpha"));
 			if (GETPOST("drop_database", "alpha"))        $param.=" --add-drop-database";
-			if (GETPOST("use_mysql_quick_param", "alpha"))$param.=" --quick";
 			if (GETPOST("sql_structure", "alpha") || $usedefault)
 			{
 				if (GETPOST("drop", "alpha") || $usedefault)	$param.=" --add-drop-table=TRUE";
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index b8595b435c1..cb0aef212fc 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -959,18 +959,18 @@ function dol_unescapefile($filename)
  */
 function dolCheckVirus($src_file)
 {
-	global $conf, $db;
+	global $conf;
 
 	if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
 	{
 		if (! class_exists('AntiVir')) {
 			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);
 		if ($result < 0)	// If virus or error, we stop here
 		{
-			$reterrors = $antivir->errors;
+			$reterrors=$antivir->errors;
 			return $reterrors;
 		}
 	}
@@ -1853,15 +1853,16 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = ''
 				if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
 
 				$count = $image->getNumberImages();
+
 				if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
 				{
-				    try {
-					   $ret = $image->writeImages($fileoutput, true);
-				    }
-				    catch(Exception $e)
-				    {
-				        dol_syslog($e->getMessage(), LOG_WARNING);
-				    }
+					try {
+						$ret = $image->writeImages($fileoutput, true);
+					}
+					catch(Exception $e)
+					{
+						dol_syslog($e->getMessage(), LOG_WARNING);
+					}
 				}
 				else
 				{
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index d6ca8cba830..73957fff5ef 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -388,7 +388,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 					//var_dump($expedition->linkedObjects);
 
 					$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))
 					{