summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfisharebest <fisharebest@gmail.com>2011-01-31 19:51:09 +0000
committerfisharebest <fisharebest@gmail.com>2011-01-31 19:51:09 +0000
commit7c3af781ec1ad2e1c04a2b203fec0ff23f7bde76 (patch)
treec84e83e22ab61d4136db1b69fe0634e74df5e73f
parentcbdea11ec5c6eaac5b68c9168c41a68279394fd0 (diff)
downloadwebtrees-7c3af781ec1ad2e1c04a2b203fec0ff23f7bde76.tar.gz
webtrees-7c3af781ec1ad2e1c04a2b203fec0ff23f7bde76.tar.bz2
webtrees-7c3af781ec1ad2e1c04a2b203fec0ff23f7bde76.zip
FIX: is_dir() gives error with badly-formed directories when open_basedir is in effect.
-rw-r--r--includes/functions/functions_mediadb.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/functions/functions_mediadb.php b/includes/functions/functions_mediadb.php
index f764ff4538..0510269ea5 100644
--- a/includes/functions/functions_mediadb.php
+++ b/includes/functions/functions_mediadb.php
@@ -923,7 +923,7 @@ function get_media_folders() {
$entry = $dir->read();
if (!$entry)
break;
- if (is_dir($currentFolder . $entry . "/")) {
+ if (is_dir($currentFolder . $entry)) {
// Weed out some folders we're not interested in
if ($entry != "." && $entry != ".." && $entry != "CVS" && $entry != ".svn") {
if ($currentFolder . $entry . "/" != $MEDIA_DIRECTORY . "thumbs/") {