diff options
| author | nikrou <nikrou@piwigo.org> | 2006-01-17 20:40:16 +0000 |
|---|---|---|
| committer | nikrou <nikrou@piwigo.org> | 2006-01-17 20:40:16 +0000 |
| commit | 9e1fabeaf7b27d0b03227965dce2f9214b3ac655 (patch) | |
| tree | 29fcd9cb91925e5276e3e11b4da3dca9edac95ca | |
| parent | c3397a2c73273ba5414d976ab7f45ae5e71a8a33 (diff) | |
- merge branch 1.5 r1000:1001 into BSF:
not include .svn directory in the candidates directories for update
git-svn-id: http://piwigo.org/svn/trunk@1006 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/include/functions.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php index 56c1bf761..4d7f4148e 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -555,6 +555,7 @@ function get_fs_directories($path, $recursive = true) if (is_dir($path.'/'.$node) and $node != '.' and $node != '..' + and $node != '.svn' and $node != 'thumbnail' and $node != 'pwg_high' and $node != 'pwg_representative') |