diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-10-14 01:30:50 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-10-14 01:30:50 +0200 |
| commit | 4fb9f2101de8de8dc08ef0a1c44f81c5443f3d7a (patch) | |
| tree | 3620bccb7d14092a77a6517f30cc91809aeae4bb /phpBB | |
| parent | f53892c838dfa3638a47b60b394a948db4873466 (diff) | |
| download | forums-4fb9f2101de8de8dc08ef0a1c44f81c5443f3d7a.tar forums-4fb9f2101de8de8dc08ef0a1c44f81c5443f3d7a.tar.gz forums-4fb9f2101de8de8dc08ef0a1c44f81c5443f3d7a.tar.bz2 forums-4fb9f2101de8de8dc08ef0a1c44f81c5443f3d7a.tar.xz forums-4fb9f2101de8de8dc08ef0a1c44f81c5443f3d7a.zip | |
[feature/extension-manager] Support extensions in subdirectories of ext/
PHPBB3-10323
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/extension/manager.php | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php index 07e98735f8..981fa43ab2 100644 --- a/phpBB/includes/extension/manager.php +++ b/phpBB/includes/extension/manager.php @@ -94,7 +94,9 @@ class phpbb_extension_manager */ public function get_extension_path($name, $phpbb_relative = false) { - return (($phpbb_relative) ? $this->phpbb_root_path : '') . 'ext/' . basename($name) . '/'; + $name = str_replace('.', '', $name); + + return (($phpbb_relative) ? $this->phpbb_root_path : '') . 'ext/' . $name . '/'; } /** @@ -106,7 +108,7 @@ class phpbb_extension_manager */ public function get_extension($name) { - $extension_class_name = 'phpbb_ext_' . $name . '_ext'; + $extension_class_name = 'phpbb_ext_' . str_replace('/', '_', $name) . '_ext'; if (class_exists($extension_class_name)) { @@ -292,13 +294,17 @@ class phpbb_extension_manager { $available = array(); - $iterator = new DirectoryIterator($this->phpbb_root_path . 'ext/'); + $iterator = new RecursiveIteratorIterator( + new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/')); foreach ($iterator as $file_info) { - $path = $this->phpbb_root_path . 'ext/' . $file_info->getBasename() . '/'; - if (!$file_info->isDot() && $file_info->isDir() && file_exists($path)) + if ($file_info->isFile() && $file_info->getFilename() == 'ext' . $this->phpEx) { - $available[$file_info->getBasename()] = $path; + $ext_name = $iterator->getInnerIterator()->getSubPath(); + + $ext_name = str_replace(DIRECTORY_SEPARATOR, '/', $ext_name); + + $available[$ext_name] = $this->phpbb_root_path . 'ext/' . $ext_name . '/'; } } ksort($available); |