diff options
| author | David King <imkingdavid@gmail.com> | 2012-11-17 17:48:20 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-11-17 17:48:20 -0500 |
| commit | 8913b2c7c4ffc38d4caf34ca7014b8a07f11d19d (patch) | |
| tree | edafc0a55ede9c99b0823b2002bef0e4c2c4182e /phpBB/includes | |
| parent | 4efbb893b7b8ada8766847dc59724faef9c18142 (diff) | |
| download | forums-8913b2c7c4ffc38d4caf34ca7014b8a07f11d19d.tar forums-8913b2c7c4ffc38d4caf34ca7014b8a07f11d19d.tar.gz forums-8913b2c7c4ffc38d4caf34ca7014b8a07f11d19d.tar.bz2 forums-8913b2c7c4ffc38d4caf34ca7014b8a07f11d19d.tar.xz forums-8913b2c7c4ffc38d4caf34ca7014b8a07f11d19d.zip | |
[feature/controller] Use query string, not path info, for controller access
This is hopefully just temporary until we can fix the relative path issue.
PHPBB3-10864
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 88ce142195..17fc16ef86 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2346,20 +2346,6 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false) $params = false; } - // Make sure we have a Symfony Request object; tests do not have one - // unless they need it. - if ($symfony_request) - { - // Correct the path when we are accessing it through a controller - // This simply rewrites the value given by $phpbb_root_path to the - // script_path in config. - $path_info = $symfony_request->getPathInfo(); - if (!empty($path_info) && $path_info != '/') - { - $url = $config['script_path'] . '/' . substr($url, strlen($phpbb_root_path)); - } - } - $append_sid_overwrite = false; /** @@ -5056,7 +5042,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 // Determine board url - we may need it later $board_url = generate_board_url() . '/'; - $web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $config['script_path'] . '/'; + $web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $phpbb_root_path; // Send a proper content-language to the output $user_lang = $user->lang['USER_LANG']; |