Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 23:11:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Function dol_dir_list broken on PHP5

Browse Source
This commit is contained in:
Laurent Destailleur
2009-10-12 18:31:45 +00:00
parent e3d43cf781
commit 4a11a0e335
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/lib/functions.lib.php
View File

@@ -2190,22 +2190,26 @@ function dol_delete_dir_recursive($dir,$count=0)
{
while (false !== ($item = readdir($handle)))
{
// readdir return value in ISO and we want UTF8 in memory
$newitem=$item;
if (! utf8_check($item)) $item=utf8_encode($item);
if ($item != "." && $item != "..")
{
if (is_dir("$dir/$item"))
if (is_dir("$newdir/$newitem"))
{
$count=dol_delete_dir_recursive("$dir/$item",$count);
}
else
{
unlink("$dir/$item");
unlink("$newdir/$newitem");
$count++;
//echo " removing $dir/$item<br>\n";
}
}
}
closedir($handle);
rmdir($dir);
rmdir($newdir);
$count++;
//echo "removing $dir<br>\n";
}