aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-10-01 00:26:39 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-10-01 00:26:39 +0200
commit236f75c6cbc833195135cf0ab801d523b4fcfdfb (patch)
treef4f918b599e82eb0ad980161d7beed71da7e2d9e /phpBB/includes
parentec89d116096f96368dd969404fee4a9612940d62 (diff)
parenta8e74fff9bc73342f95b5e863bc7cc7894b37f8a (diff)
downloadforums-236f75c6cbc833195135cf0ab801d523b4fcfdfb.tar
forums-236f75c6cbc833195135cf0ab801d523b4fcfdfb.tar.gz
forums-236f75c6cbc833195135cf0ab801d523b4fcfdfb.tar.bz2
forums-236f75c6cbc833195135cf0ab801d523b4fcfdfb.tar.xz
forums-236f75c6cbc833195135cf0ab801d523b4fcfdfb.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index fe03efddf2..22c1a092b5 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -31,7 +31,7 @@ function phpbb_load_extensions_autoloaders($phpbb_root_path)
new \phpbb\recursive_dot_prefix_filter_iterator(
new \RecursiveDirectoryIterator(
$phpbb_root_path . 'ext/',
- \FilesystemIterator::SKIP_DOTS
+ \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS
)
),
\RecursiveIteratorIterator::SELF_FIRST