aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-01-03 04:10:04 +0100
committerAndreas Fischer <bantu@phpbb.com>2013-01-03 04:10:04 +0100
commit228580b6743b9650996284dd04a3f5de6c2447ca (patch)
tree0fdd5047a251aaf8a9d74e0d3a9309ddd4c600a3 /phpBB/includes
parent300b8236eb8d08603207e01498a98abcc43cce1b (diff)
parentcac39360669b10c7a27549ca36865249014e6d22 (diff)
downloadforums-228580b6743b9650996284dd04a3f5de6c2447ca.tar
forums-228580b6743b9650996284dd04a3f5de6c2447ca.tar.gz
forums-228580b6743b9650996284dd04a3f5de6c2447ca.tar.bz2
forums-228580b6743b9650996284dd04a3f5de6c2447ca.tar.xz
forums-228580b6743b9650996284dd04a3f5de6c2447ca.zip
Merge remote-tracking branch 'erikfrerejean/ticket/11283' into develop
* erikfrerejean/ticket/11283: [ticket/11283] Extension manager follow symlinks.
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/extension/manager.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 67cc81e407..de6f364320 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -384,7 +384,7 @@ class phpbb_extension_manager
}
$iterator = new RecursiveIteratorIterator(
- new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/'),
+ new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/', FilesystemIterator::NEW_CURRENT_AND_KEY | FilesystemIterator::FOLLOW_SYMLINKS),
RecursiveIteratorIterator::SELF_FIRST);
foreach ($iterator as $file_info)
{