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

merge r12642 from trunk to branch 2.3

Browse source 
bug:2513
Warning messages during synchronisation on some servers

git-svn-id: http://piwigo.org/svn/branches/2.3@12643 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2011-11-17 18:10:51 +00:00
parent 942a8c0d74
commit 26def66685
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
admin/include/functions.php
View file

@ -533,13 +533,13 @@ function get_fs_directories($path, $recursive = true)
{
while (($node = readdir($contents)) !== false)
{
if (is_dir($path.'/'.$node)
and $node != '.'
if ($node != '.'
and $node != '..'
and $node != '.svn'
and $node != 'thumbnail'
and $node != 'pwg_high'
and $node != 'pwg_representative')
and $node != 'pwg_representative'
and is_dir($path.'/'.$node))
{
array_push($dirs, $path.'/'.$node);
if ($recursive)

4
admin/site_reader_local.php
View file

@ -84,6 +84,8 @@ function get_elements($path)
{
while (($node = readdir($contents)) !== false)
{
if ($node == '.' or $node == '..') continue;
if (is_file($path.'/'.$node))
{
$extension = get_extension($node);
@ -98,8 +100,6 @@ function get_elements($path)
}
}
elseif (is_dir($path.'/'.$node)
and $node != '.'
and $node != '..'
and $node != 'pwg_high'
and $node != 'pwg_representative'
and $node != 'thumbnail' )