Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX delete dir when there is symlinks

Browse Source
This commit is contained in:
Laurent Destailleur
2017-08-21 01:24:34 +02:00
parent e7ae82f9b3
commit eedf5e0a22
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -714,9 +714,9 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
$dir_handle=opendir($ossrcfile); $dir_handle=opendir($ossrcfile);
while ($file=readdir($dir_handle)) while ($file=readdir($dir_handle))
{ {
if ($file!="." && $file!="..") if ($file != "." && $file != ".." && ! is_link($ossrcfile."/".$file))
{ {
if (is_dir($ossrcfile."/".$file) && ! is_link($ossrcfile."/".$file)) if (is_dir($ossrcfile."/".$file))
{ {
//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists"); //var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
$tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement); $tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);