makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10323] slight potential performance improvement

Browse source 
PHPBB3-10323
This commit is contained in:
Igor Wiedler 2011-11-20 02:08:37 +01:00
parent 658db65cb4
commit 813b5344e6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/extension/finder.php
View file

@ -380,7 +380,8 @@ class phpbb_extension_finder
$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST); $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST);
foreach ($iterator as $file_info) foreach ($iterator as $file_info)
{ {
if (in_array($file_info, array('.', '..'))) $filename = $file_info->getFilename();
if ($filename == '.' || $filename == '..')
{ {
continue; continue;
} }
@ -389,7 +390,7 @@ class phpbb_extension_finder
{ {
if ($is_dir) if ($is_dir)
{ {
$relative_path = $iterator->getInnerIterator()->getSubPath() . DIRECTORY_SEPARATOR . basename($file_info->getFilename()) . DIRECTORY_SEPARATOR; $relative_path = $iterator->getInnerIterator()->getSubPath() . DIRECTORY_SEPARATOR . basename($filename) . DIRECTORY_SEPARATOR;
if ($relative_path[0] !== DIRECTORY_SEPARATOR) if ($relative_path[0] !== DIRECTORY_SEPARATOR)
{ {
$relative_path = DIRECTORY_SEPARATOR . $relative_path; $relative_path = DIRECTORY_SEPARATOR . $relative_path;
@ -399,10 +400,9 @@ class phpbb_extension_finder
{ {
$relative_path = DIRECTORY_SEPARATOR . $iterator->getInnerIterator()->getSubPathname(); $relative_path = DIRECTORY_SEPARATOR . $iterator->getInnerIterator()->getSubPathname();
} }
$item_name = $file_info->getFilename();
if ((!$suffix || substr($relative_path, -strlen($suffix)) === $suffix) && if ((!$suffix || substr($relative_path, -strlen($suffix)) === $suffix) &&
(!$prefix || substr($item_name, 0, strlen($prefix)) === $prefix) && (!$prefix || substr($filename, 0, strlen($prefix)) === $prefix) &&
(!$directory || preg_match($directory_pattern, $relative_path))) (!$directory || preg_match($directory_pattern, $relative_path)))
{ {
$files[str_replace(DIRECTORY_SEPARATOR, '/', $location . $name . substr($relative_path, 1))] = $ext_name; $files[str_replace(DIRECTORY_SEPARATOR, '/', $location . $name . substr($relative_path, 1))] = $ext_name;