1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

[feature/extension-manager] extension finder now saves ext it found a file in

PHPBB3-10323
This commit is contained in:
Nils Adermann
2011-10-13 21:19:35 +02:00
parent 7b12bba95b
commit 724f40f0f4
3 changed files with 16 additions and 13 deletions

View File

@@ -210,7 +210,7 @@ class phpbb_extension_finder
$files = $this->find($cache, false);
$classes = array();
foreach ($files as $file)
foreach ($files as $file => $ext_name)
{
$file = preg_replace('#^includes/#', '', $file);
@@ -253,7 +253,7 @@ class phpbb_extension_finder
$items = $this->find($cache, $is_dir);
$result = array();
foreach ($items as $item)
foreach ($items as $item => $ext_name)
{
$result[] = $this->phpbb_root_path . $item;
}
@@ -289,6 +289,8 @@ class phpbb_extension_finder
foreach ($extensions as $name => $path)
{
$ext_name = $name;
if (!file_exists($path))
{
continue;
@@ -349,7 +351,7 @@ class phpbb_extension_finder
(!$prefix || substr($item_name, 0, strlen($prefix)) === $prefix) &&
(!$directory || preg_match($directory_pattern, $relative_path)))
{
$files[] = str_replace(DIRECTORY_SEPARATOR, '/', $location . $name . substr($relative_path, 1));
$files[str_replace(DIRECTORY_SEPARATOR, '/', $location . $name . substr($relative_path, 1))] = $ext_name;
}
}
}