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

Fix We never add .noexe of files into medias dir

Browse Source
This commit is contained in:
Laurent Destailleur 2020-06-12 15:20:28 +02:00
parent 5d5fb46af6
commit 9bb5135317
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/actions_linkedfiles.inc.php
View File

@ -201,7 +201,7 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
$publicmediasdirwithslash = $conf->medias->multidir_output[$conf->entity];
if (! preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash.='/';
if ($upload_dir != $publicmediasdirwithslash) { // We never add .noexe on files into media directory
if (strpos($upload_dir, $publicmediasdirwithslash) !== 0) { // We never add .noexe on files into media directory
$filenameto .= '.noexe';
}
}

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

@ -1073,7 +1073,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
$publicmediasdirwithslash = $conf->medias->multidir_output[$conf->entity];
if (! preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash.='/';
if ($upload_dir != $publicmediasdirwithslash) { // We never add .noexe on files into media directory
if (strpos($upload_dir, $publicmediasdirwithslash) !== 0) { // We never add .noexe on files into media directory
$file_name .= '.noexe';
$successcode = 2;
}