diff options
| author | David King <imkingdavid@gmail.com> | 2013-09-02 10:51:46 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-09-02 10:54:55 -0700 |
| commit | 913e5a1f2e847c922f8b48e2c069ba204a976e51 (patch) | |
| tree | acec546c18624a6bc4c00a1e38a7628534a25851 /phpBB/phpbb/controller | |
| parent | 9d48ee446b10e492b83448c3778b48729839b788 (diff) | |
| download | forums-913e5a1f2e847c922f8b48e2c069ba204a976e51.tar forums-913e5a1f2e847c922f8b48e2c069ba204a976e51.tar.gz forums-913e5a1f2e847c922f8b48e2c069ba204a976e51.tar.bz2 forums-913e5a1f2e847c922f8b48e2c069ba204a976e51.tar.xz forums-913e5a1f2e847c922f8b48e2c069ba204a976e51.zip | |
[ticket/11215] Make controller helper url() method use correct format
PHPBB3-11215
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 74410ddfd1..a14354973e 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -36,6 +36,12 @@ class phpbb_controller_helper protected $user; /** + * Request object + * @var phpbb_request + */ + protected $request; + + /** * phpBB root path * @var string */ @@ -55,10 +61,11 @@ class phpbb_controller_helper * @param string $phpbb_root_path phpBB root path * @param string $php_ext PHP extension */ - public function __construct(phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext) + public function __construct(phpbb_template $template, phpbb_user $user, phpbb_request $request, $phpbb_root_path, $php_ext) { $this->template = $template; $this->user = $user; + $this->request = $request; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; } @@ -102,22 +109,16 @@ class phpbb_controller_helper $route = substr($route, 0, $route_delim); } - if (is_array($params) && !empty($params)) - { - $params = array_merge(array( - 'controller' => $route, - ), $params); - } - else if (is_string($params) && $params) - { - $params = 'controller=' . $route . (($is_amp) ? '&' : '&') . $params; - } - else - { - $params = array('controller' => $route); - } + $request_uri = $this->request->variable('REQUEST_URI', '', false, phpbb_request::SERVER); + $script_name = $this->request->variable('SCRIPT_NAME', '', false, phpbb_request::SERVER); + + // If the app.php file is being used (no rewrite) keep it in the URL. + // Otherwise, don't include it. + $route_prefix = $this->phpbb_root_path; + $parts = explode('/', $script_name); + $route_prefix .= strpos($request_uri, $script_name) === 0 ? array_pop($parts) . '/' : ''; - return append_sid($this->phpbb_root_path . 'app.' . $this->php_ext . $route_params, $params, $is_amp, $session_id); + return append_sid($route_prefix . "$route" . $route_params, $params, $is_amp, $session_id); } /** |