archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r12640 from trunk to branch 2.3

Browse source 
bug:2511
Warning messages during thumbnails creation (FTP method)

git-svn-id: http://piwigo.org/svn/branches/2.3@12641 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2011-11-17 14:41:38 +00:00
parent bc16508161
commit 942a8c0d74
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
admin/include/functions.php
View file

@ -858,6 +858,8 @@ function get_fs($path, $recursive = true)
{
while (($node = readdir($contents)) !== false)
{
if ($node == '.' or $node == '..') continue;
if (is_file($path.'/'.$node))
{
$extension = get_extension($node);
@ -884,11 +886,7 @@ function get_fs($path, $recursive = true)
array_push($fs['elements'], $path.'/'.$node);
}
}
else if (is_dir($path.'/'.$node)
and $node != '.'
and $node != '..'
and $node != 'pwg_high'
and $recursive)
else if (is_dir($path.'/'.$node) and $node != 'pwg_high' and $recursive)
{
array_push($subdirs, $node);
}