aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/style/extension_path_provider.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-03-04 00:22:15 +0100
committerMarc Alexander <admin@m-a-styles.de>2013-03-04 00:22:15 +0100
commitd26ad8ed2693b03a12eec4deec729e972579e5d9 (patch)
tree5e5089616cc4b398c1c698154ff5fdac8f6d1476 /phpBB/includes/style/extension_path_provider.php
parent8a9e1ca3f176946bc7b8ddb9be30ca8607685b80 (diff)
parentbee4f8d8185d4ff5278be758db4ea4a814f09b4f (diff)
downloadforums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar
forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar.gz
forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar.bz2
forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar.xz
forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts: phpBB/install/database_update.php
Diffstat (limited to 'phpBB/includes/style/extension_path_provider.php')
-rw-r--r--phpBB/includes/style/extension_path_provider.php2
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;