diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-03-26 13:18:54 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-03-26 13:18:54 +0100 |
| commit | 34cdbd0360e756a5ef9646554905697f7ae1ba1f (patch) | |
| tree | 58486124738299ef5e8fca3761d4d82189cf41a6 /phpBB/includes/style | |
| parent | f0b0978538a1b1e25b688cce1794c764f2d363f0 (diff) | |
| parent | 8b464e87f0a41422dddaa647ac42ab9c7950bb4b (diff) | |
| download | forums-34cdbd0360e756a5ef9646554905697f7ae1ba1f.tar forums-34cdbd0360e756a5ef9646554905697f7ae1ba1f.tar.gz forums-34cdbd0360e756a5ef9646554905697f7ae1ba1f.tar.bz2 forums-34cdbd0360e756a5ef9646554905697f7ae1ba1f.tar.xz forums-34cdbd0360e756a5ef9646554905697f7ae1ba1f.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314
Conflicts:
phpBB/styles/prosilver/template/timezone.js
Diffstat (limited to 'phpBB/includes/style')
| -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; |