diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-02-21 18:32:08 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-02-21 18:32:08 +0100 |
| commit | 41870c40954bdd0faad2ce4b01fb416a03eed4e0 (patch) | |
| tree | dae3a6f246a434b2ba4fa6d6c7d977fdc52cd736 /phpBB | |
| parent | 3762bf5e99f0ac4202aec117a959b64efc98deff (diff) | |
| download | forums-41870c40954bdd0faad2ce4b01fb416a03eed4e0.tar forums-41870c40954bdd0faad2ce4b01fb416a03eed4e0.tar.gz forums-41870c40954bdd0faad2ce4b01fb416a03eed4e0.tar.bz2 forums-41870c40954bdd0faad2ce4b01fb416a03eed4e0.tar.xz forums-41870c40954bdd0faad2ce4b01fb416a03eed4e0.zip | |
[ticket/10663] Extension finder should not find subdirs with directory filter
The directory filter pattern now has a $ in the end, do avoid subdirectories
from being matched as well.
PHPBB3-10663
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/extension/finder.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php index e5e5e4983e..23b9f1c658 100644 --- a/phpBB/includes/extension/finder.php +++ b/phpBB/includes/extension/finder.php @@ -375,6 +375,10 @@ class phpbb_extension_finder { $directory_pattern = preg_quote(DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $directory) . DIRECTORY_SEPARATOR, '#'); } + if ($is_dir) + { + $directory_pattern .= '$'; + } $directory_pattern = '#' . $directory_pattern . '#'; $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST); |