From 4346a3f90f2a861055a10fd8d46f483f90558421 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Aug 2013 19:34:13 +0200
Subject: [PATCH] Fix: Param must be a regex string
Conflicts:
htdocs/core/class/html.formfile.class.php
---
htdocs/core/class/html.formfile.class.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 7a08a1ca77a..997f73c4c71 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -559,15 +559,13 @@ class FormFile
*/
function getDocumentsLink($modulepart, $filename, $filedir)
{
- if (! function_exists('dol_dir_list')) {
- include DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- }
+ if (! function_exists('dol_dir_list')) include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$out='';
$this->numoffiles=0;
- $file_list=dol_dir_list($filedir, 'files', 0, $filename.'.pdf', '\.meta$|\.png$');
+ $file_list=dol_dir_list($filedir, 'files', 0, preg_quote($filename.'.pdf','/'), '\.meta$|\.png$');
// For ajax treatment
$out.= '<div id="gen_pdf_'.$filename.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
--
GitLab