summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-07-15 14:51:18 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-07-15 14:51:18 +0000
commitca8c292bb8f27baa8e5e09b36ad2a66d65b2b2e6 (patch)
tree47938e3d964ed50bbd525b95d22698d1ae5415ab
parentfdda5d1480469fd38bc0d4428ec3aa87d73e6fbd (diff)
downloadampache-ca8c292bb8f27baa8e5e09b36ad2a66d65b2b2e6.tar.gz
ampache-ca8c292bb8f27baa8e5e09b36ad2a66d65b2b2e6.tar.bz2
ampache-ca8c292bb8f27baa8e5e09b36ad2a66d65b2b2e6.zip
sync from branch of ignore . files change
-rwxr-xr-xdocs/CHANGELOG2
-rw-r--r--lib/class/catalog.class.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 7b1b6f85..668d839c 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,8 @@
--------------------------------------------------------------------------
v.3.5-Alpha1
+ - Ignore filenames that start with . (hidden) solves an issue
+ with mac filesystems
- Fix tracking of stats for downloaded songs
- Fix divide by 0 error during transcode in some configurations
- Remove root mysql pw requirement from installer
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index c4cf70e0..e518c5b8 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -430,7 +430,7 @@ class Catalog {
while ( false !== ( $file = readdir($handle) ) ) {
/* Skip to next if we've got . or .. */
- if ($file == '.' || $file == '..') { continue; }
+ if (substr($file,0,1) == '.' || $file == '..') { continue; }
debug_event('read',"Starting work on $file inside $path",'5','ampache-catalog');