aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2016-03-16 19:10:34 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-03-16 19:10:34 +0100
commiteca4726f3c2fda312b3150b7b252a300d4603fbe (patch)
treeb37319a9e1354f01f243f4a85eb4c4280682af16 /phpBB/phpbb
parentd8e7f865d8e0d2ea5d93f6450b9705d869a8b274 (diff)
parent0194c78d19425a0d54b690bed210eebf34cd9007 (diff)
downloadforums-eca4726f3c2fda312b3150b7b252a300d4603fbe.tar
forums-eca4726f3c2fda312b3150b7b252a300d4603fbe.tar.gz
forums-eca4726f3c2fda312b3150b7b252a300d4603fbe.tar.bz2
forums-eca4726f3c2fda312b3150b7b252a300d4603fbe.tar.xz
forums-eca4726f3c2fda312b3150b7b252a300d4603fbe.zip
Merge branch '3.1.x' into 3.2.x
* 3.1.x: [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/recursive_dot_prefix_filter_iterator.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/recursive_dot_prefix_filter_iterator.php b/phpBB/phpbb/recursive_dot_prefix_filter_iterator.php
index 2500ba0cf8..1446551b8b 100644
--- a/phpBB/phpbb/recursive_dot_prefix_filter_iterator.php
+++ b/phpBB/phpbb/recursive_dot_prefix_filter_iterator.php
@@ -25,6 +25,6 @@ class recursive_dot_prefix_filter_iterator extends \RecursiveFilterIterator
public function accept()
{
$filename = $this->current()->getFilename();
- return !$this->current()->isDir() || $filename[0] !== '.';
+ return $filename[0] !== '.' || !$this->current()->isDir();
}
}