diff options
author | Nils Adermann <naderman@naderman.de> | 2011-08-30 01:15:43 -0400 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2011-09-29 15:42:49 +0200 |
commit | 6ea6d50ccb9607429486a01d3144c7d32322e1b5 (patch) | |
tree | 4e81742c0f0a158b49cf7b62821d8f58fbc02626 /phpBB/includes/extension/manager.php | |
parent | 6c6a7d7992460e301615bcc1e13bee92ecc65724 (diff) | |
download | forums-6ea6d50ccb9607429486a01d3144c7d32322e1b5.tar forums-6ea6d50ccb9607429486a01d3144c7d32322e1b5.tar.gz forums-6ea6d50ccb9607429486a01d3144c7d32322e1b5.tar.bz2 forums-6ea6d50ccb9607429486a01d3144c7d32322e1b5.tar.xz forums-6ea6d50ccb9607429486a01d3144c7d32322e1b5.zip |
[feature/extension-manager] Don't cache the phpbb_root_path in the ext manager
Otherwise the paths are incorrect from e.g. adm/
PHPBB3-10323
Diffstat (limited to 'phpBB/includes/extension/manager.php')
-rw-r--r-- | phpBB/includes/extension/manager.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php index a6c8ebb3d0..ef714638c3 100644 --- a/phpBB/includes/extension/manager.php +++ b/phpBB/includes/extension/manager.php @@ -93,7 +93,7 @@ class phpbb_extension_manager */ public function get_extension_path($name) { - return $this->phpbb_root_path . 'ext/' . basename($name) . '/'; + return 'ext/' . basename($name) . '/'; } /** @@ -315,7 +315,13 @@ class phpbb_extension_manager */ public function all_configured() { - return $this->extensions; + $configured = array(); + foreach ($this->extensions as $name => $data) + { + $data['ext_path'] = $this->phpbb_root_path . $data['ext_path']; + $configured[$name] = $data; + } + return $configured; } /** @@ -331,7 +337,7 @@ class phpbb_extension_manager { if ($data['ext_active']) { - $enabled[$name] = $data['ext_path']; + $enabled[$name] = $this->phpbb_root_path . $data['ext_path']; } } return $enabled; @@ -350,7 +356,7 @@ class phpbb_extension_manager { if (!$data['ext_active']) { - $disabled[$name] = $data['ext_path']; + $disabled[$name] = $this->phpbb_root_path . $data['ext_path']; } } return $disabled; |