summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-09-14 11:17:11 +0100
committerGreg Roach <fisharebest@webtrees.net>2019-09-14 11:17:11 +0100
commit30b663a73e0fedff7dfefadb2be5378b02e5fbf0 (patch)
tree4c85ff506110bc3c0abe8385bbda9982473f82cb
parent0d45b3e3f693321cf25e3077e41d70907b9ed720 (diff)
downloadwebtrees-30b663a73e0fedff7dfefadb2be5378b02e5fbf0.tar.gz
webtrees-30b663a73e0fedff7dfefadb2be5378b02e5fbf0.tar.bz2
webtrees-30b663a73e0fedff7dfefadb2be5378b02e5fbf0.zip
Better test for internal/special folders
-rw-r--r--app/Http/Controllers/EditMediaController.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Http/Controllers/EditMediaController.php b/app/Http/Controllers/EditMediaController.php
index 0de21800f8..c013ed115a 100644
--- a/app/Http/Controllers/EditMediaController.php
+++ b/app/Http/Controllers/EditMediaController.php
@@ -642,7 +642,7 @@ class EditMediaController extends AbstractEditController
if ($file->isFile()) {
$filename = substr($file->getPathname(), strlen($media_dir));
// Older versions of webtrees used a couple of special folders.
- if (strpos($filename, 'thumbs/') !== 0 && strpos($filename, 'watermarks/') !== 0) {
+ if (strpos($filename, 'thumbs/') === false && strpos($filename, 'watermarks/') === false) {
$disk_files[] = $filename;
}
}