diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-02 14:48:44 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-02 14:48:44 -0600 |
| commit | 59638a6a7d873b8ec5b9b2e9e72fdf693bde260a (patch) | |
| tree | a5f2fd9cd7ca5c12b0ad2b12da492458a83dcf09 /phpBB/includes/style/extension_path_provider.php | |
| parent | a6f877c0d84ff102d3812246eae7469e191983e2 (diff) | |
| parent | 4670ffe90c221ffc65d9ecca8a98e2bdc888a258 (diff) | |
| download | forums-59638a6a7d873b8ec5b9b2e9e72fdf693bde260a.tar forums-59638a6a7d873b8ec5b9b2e9e72fdf693bde260a.tar.gz forums-59638a6a7d873b8ec5b9b2e9e72fdf693bde260a.tar.bz2 forums-59638a6a7d873b8ec5b9b2e9e72fdf693bde260a.tar.xz forums-59638a6a7d873b8ec5b9b2e9e72fdf693bde260a.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386
Conflicts:
phpBB/includes/extension/finder.php
Diffstat (limited to 'phpBB/includes/style/extension_path_provider.php')
| -rw-r--r-- | phpBB/includes/style/extension_path_provider.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/style/extension_path_provider.php b/phpBB/includes/style/extension_path_provider.php index 4eac300424..6976a45ed0 100644 --- a/phpBB/includes/style/extension_path_provider.php +++ b/phpBB/includes/style/extension_path_provider.php @@ -92,7 +92,7 @@ class phpbb_style_extension_path_provider extends phpbb_extension_provider imple if ($path && !phpbb_is_absolute($path)) { $result = $finder->directory('/' . $this->ext_dir_prefix . $path) - ->get_directories(true, true); + ->get_directories(true, false, true); foreach ($result as $ext => $ext_path) { $directories[$ext][] = $ext_path; |