Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
bug:2513
Warning messages during synchronisation on some servers

git-svn-id: http://piwigo.org/svn/trunk@12642 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
patdenice committed Nov 17, 2011
1 parent 5c7f267 commit 95325c6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions admin/include/functions.php
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions admin/site_reader_local.php
Expand Up @@ -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);
Expand All @@ -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' )
Expand Down

0 comments on commit 95325c6

Please sign in to comment.