Exclude directories now

diff --git a/inc/functions.php b/inc/functions.php
index e68db149d1bfdfdc203fc6d9f24d6723ed066fe6..9060a90193d3f85512b0599ca1a7a87efe22a99b 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1865,7 +1865,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = FALSE, $ad
                                // We found .php file but should not search for them, why?
                                reportBug(__FUNCTION__, __LINE__, 'We should find files with extension=' . $extension . ', but we found a PHP script. (baseFile=' . $baseFile . ')');
                        }
-               } elseif (($fileExtension == $extension) || (empty($extension))) {
+               } elseif ((($fileExtension == $extension) || (empty($extension))) && (isFileReadable($FQFN))) {
                        // Other, generic file found
                        if ($addBaseDir === TRUE) {
                                // With base path

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 32ab18e167a96d05d2579c18defc13ba5049175d..0969cf0bc5579c6d4b6197fe561d0d80bb54ba78 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -199,7 +199,7 @@ function isDirectory ($FQFN) {
                $baseName = basename($FQFN);
 
                // Check it
-               $GLOBALS[__FUNCTION__][$FQFN] = ((is_dir($FQFN)) && ($baseName != '.') && ($baseName != '..') && ($baseName != '.svn'));
+               $GLOBALS[__FUNCTION__][$FQFN] = ((is_dir($FQFN)) && (!in_array($baseName, array('.', '..', '.svn'))));
        } // END - if
 
        // Return the result