diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-02-24 13:55:36 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-02-24 13:55:36 +0100 |
| commit | dd160e19a26a9961167d880f0ca70a7d49a950dc (patch) | |
| tree | 843e14b00a80c253bfad8cd6e9972dd67bcc253c | |
| parent | c9b36c5a2e8466f88aa42d0e6736a461db356628 (diff) | |
| parent | 41870c40954bdd0faad2ce4b01fb416a03eed4e0 (diff) | |
| download | forums-dd160e19a26a9961167d880f0ca70a7d49a950dc.tar forums-dd160e19a26a9961167d880f0ca70a7d49a950dc.tar.gz forums-dd160e19a26a9961167d880f0ca70a7d49a950dc.tar.bz2 forums-dd160e19a26a9961167d880f0ca70a7d49a950dc.tar.xz forums-dd160e19a26a9961167d880f0ca70a7d49a950dc.zip | |
Merge remote-tracking branch 'naderman/ticket/10663' into develop
* naderman/ticket/10663:
[ticket/10663] Extension finder should not find subdirs with directory filter
[ticket/10663] Adding nested directory to finder test
| -rw-r--r-- | phpBB/includes/extension/finder.php | 4 | ||||
| -rw-r--r-- | tests/extension/ext/foo/type/dummy/empty.txt | 0 |
2 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); diff --git a/tests/extension/ext/foo/type/dummy/empty.txt b/tests/extension/ext/foo/type/dummy/empty.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/extension/ext/foo/type/dummy/empty.txt |