diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-10-13 21:19:35 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-10-13 21:19:35 +0200 |
| commit | 724f40f0f4fdfc47764a069cc91f045f0c67f4fb (patch) | |
| tree | 14ae2ccfbe338b8e1088052d5b7f64eb27b031e3 /phpBB | |
| parent | 7b12bba95bb7c59bde65e8ea1ffb1275944fd965 (diff) | |
| download | forums-724f40f0f4fdfc47764a069cc91f045f0c67f4fb.tar forums-724f40f0f4fdfc47764a069cc91f045f0c67f4fb.tar.gz forums-724f40f0f4fdfc47764a069cc91f045f0c67f4fb.tar.bz2 forums-724f40f0f4fdfc47764a069cc91f045f0c67f4fb.tar.xz forums-724f40f0f4fdfc47764a069cc91f045f0c67f4fb.zip | |
[feature/extension-manager] extension finder now saves ext it found a file in
PHPBB3-10323
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/extension/finder.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php index d599dfb86d..0c8c5d337c 100644 --- a/phpBB/includes/extension/finder.php +++ b/phpBB/includes/extension/finder.php @@ -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; } } } |