diff options
| author | patdenice <patdenice@piwigo.org> | 2011-11-17 18:10:51 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2011-11-17 18:10:51 +0000 |
| commit | 26def6668593bfbc03935eb2bd1ab7bc66d974a9 (patch) | |
| tree | 7939234150d11262b76f26481d415f2c7d3540cd | |
| parent | 942a8c0d74db4ec5a63a99fa12d50de202ed0212 (diff) | |
merge r12642 from trunk to branch 2.3
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
| -rw-r--r-- | admin/include/functions.php | 6 | ||||
| -rw-r--r-- | admin/site_reader_local.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php index 77e419d5b..dfc596235 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -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) diff --git a/admin/site_reader_local.php b/admin/site_reader_local.php index da12e9398..5a48fe30a 100644 --- a/admin/site_reader_local.php +++ b/admin/site_reader_local.php @@ -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' ) |