diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 3505f9d7371..74f190074b6 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -495,17 +495,18 @@ class FormFile
                 $out.= '</a>'."\n";
                 if (! $iconPDF)
                 {
+                	$size=(! empty($file['size'])?$file['size']:dol_filesize($filedir."/".$file["name"]));
+                	$date=(! empty($file['date'])?$file['date']:dol_filemtime($filedir."/".$file["name"]));
                 	$out.= '</td>';
                 	// Show file size
-                	$out.= '<td align="right" nowrap="nowrap">'.dol_print_size(dol_filesize($filedir."/".$file["name"])).'</td>';
+                	$out.= '<td align="right" nowrap="nowrap">'.dol_print_size($size).'</td>';
                 	// Show file date
-                	$out.= '<td align="right" nowrap="nowrap">'.dol_print_date(dol_filemtime($filedir."/".$file["name"]),'dayhour').'</td>';
+                	$out.= '<td align="right" nowrap="nowrap">'.dol_print_date($date, 'dayhour').'</td>';
                 }
 
                 if ($delallowed)
                 {
                     $out.= '<td align="right">';
-                    //$out.= '<a href="'.DOL_URL_ROOT.'/document.php?action=remove_file&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath);
                     $out.= '<a href="'.$urlsource.(strpos($urlsource,'?')?'&':'?').'action=remove_file&modulepart='.$modulepart.'&file='.urlencode($relativepath);
                     $out.= ($param?'&'.$param:'');
                     $out.= '&urlsource='.urlencode($urlsource);
@@ -577,7 +578,6 @@ class FormFile
         {
             if ($file['name'] != '.'
             && $file['name'] != '..'
-            && $file['name'] != 'CVS'
             && ! preg_match('/\.meta$/i',$file['name']))
             {
                 // Define relative path used to store the file
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 6fc1cdb2697..529a9e423c4 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -489,4 +489,4 @@ function accessforbidden($message='',$printheader=1,$printfooter=1,$showonlymess
     exit(0);
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index f07b72c4d2f..199f06c43de 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1273,7 +1273,7 @@ abstract class DolibarrModules
         $err=0;
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." like '".$this->const_name."_DIR_%'";
+        $sql.= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->const_name."_DIR_%'";
         $sql.= " AND entity = ".$conf->entity;
 
         dol_syslog(get_class($this)."::delete_dirs sql=".$sql);
@@ -1408,4 +1408,4 @@ abstract class DolibarrModules
     }
 
 }
-?>
\ No newline at end of file
+?>