diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2015-01-17 11:05:18 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2015-01-17 11:40:10 +0100 |
| commit | 6842831d6baa59425ec83cc2ebbae377942824ce (patch) | |
| tree | 991136c6fc7b063d5fabe64750c9e1f7db433ba8 /phpBB/phpbb/routing | |
| parent | 0344e61b8cd5d3964bcfae147e2bebc8c74fa3be (diff) | |
| download | forums-6842831d6baa59425ec83cc2ebbae377942824ce.tar forums-6842831d6baa59425ec83cc2ebbae377942824ce.tar.gz forums-6842831d6baa59425ec83cc2ebbae377942824ce.tar.bz2 forums-6842831d6baa59425ec83cc2ebbae377942824ce.tar.xz forums-6842831d6baa59425ec83cc2ebbae377942824ce.zip | |
[ticket/13513] Use paths relative to the phpBB root in the router
PHPBB3-13513
Diffstat (limited to 'phpBB/phpbb/routing')
| -rw-r--r-- | phpBB/phpbb/routing/router.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/phpbb/routing/router.php b/phpBB/phpbb/routing/router.php index 1003708540..601d774129 100644 --- a/phpBB/phpbb/routing/router.php +++ b/phpBB/phpbb/routing/router.php @@ -106,25 +106,25 @@ class router implements RouterInterface /** * Find the list of routing files * - * @param array $paths Array of paths where to look for routing files. + * @param array $paths Array of paths where to look for routing files (they must be relative to the phpBB root path). * @return router */ public function find_routing_files(array $paths) { - $this->routing_files = array($this->phpbb_root_path . 'config/' . $this->environment . '/routing/environment.yml'); + $this->routing_files = array('config/' . $this->environment . '/routing/environment.yml'); foreach ($paths as $path) { - if (file_exists($path . 'config/' . $this->environment . '/routing/environment.yml')) + if (file_exists($this->phpbb_root_path . $path . 'config/' . $this->environment . '/routing/environment.yml')) { $this->routing_files[] = $path . 'config/' . $this->environment . '/routing/environment.yml'; } - else if (!is_dir($path . 'config/' . $this->environment)) + else if (!is_dir($this->phpbb_root_path . $path . 'config/' . $this->environment)) { - if (file_exists($path . 'config/default/routing/environment.yml')) + if (file_exists($this->phpbb_root_path . $path . 'config/default/routing/environment.yml')) { $this->routing_files[] = $path . 'config/default/routing/environment.yml'; } - else if (!is_dir($path . 'config/default/routing') && file_exists($path . 'config/routing.yml')) + else if (!is_dir($this->phpbb_root_path . $path . 'config/default/routing') && file_exists($this->phpbb_root_path . $path . 'config/routing.yml')) { $this->routing_files[] = $path . 'config/routing.yml'; } @@ -164,7 +164,7 @@ class router implements RouterInterface { if ($this->route_collection == null || empty($this->routing_files)) { - $this->find_routing_files($this->extension_manager->all_enabled()) + $this->find_routing_files($this->extension_manager->all_enabled(false)) ->find($this->phpbb_root_path); } |