From 12bebdefbb7eb09f2fd7f632120d62cd6d1f8150 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Aug 2019 04:00:08 +0200
Subject: [PATCH] Fix can replace PclZip with ZipArchive

---
 htdocs/core/lib/files.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 5889c8270cab6..64d3b414cf8f2 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2004,9 +2004,9 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz")
  */
 function dol_uncompress($inputfile, $outputdir)
 {
-	global $langs;
+	global $conf, $langs;
 
-	if (defined('ODTPHP_PATHTOPCLZIP'))
+	if (defined('ODTPHP_PATHTOPCLZIP') && empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_UNCOMPRESS))
 	{
 		dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
 		include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';