mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

[ticket/13034] Fix the route generated for the frontend not in the phpbb root

Browse Source 
PHPBB3-13034
This commit is contained in:
Tristan Darricau
2014-09-04 16:45:53 +02:00
parent 10c99b3c2b
commit cb3eb84665
4 changed files with 63 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
phpBB/phpbb/controller/helper.php
View File

@@ -119,27 +119,23 @@ class helper
$anchor = '#' . $params['#'];
unset($params['#']);
}
$url_generator = new UrlGenerator($this->route_collection, new RequestContext());
$route_url = $url_generator->generate($route, $params);
if (strpos($route_url, '/') === 0)
{
$route_url = substr($route_url, 1);
}
$context = new RequestContext();
$context->fromRequest($this->symfony_request);
$script_name = $this->symfony_request->getScriptName();
$page_name = substr($script_name, -1, 1) == '/' ? '' : basename($script_name);
$context->setBaseUrl(str_replace('/' . $page_name, empty($this->config['enable_mod_rewrite']) ? '/app.' . $this->php_ext : '', $context->getBaseUrl()));
$url_generator = new UrlGenerator($this->route_collection, $context);
$route_url = $url_generator->generate($route, $params);
if ($is_amp)
{
$route_url = str_replace(array('&', '&'), array('&', '&'), $route_url);
}
// If enable_mod_rewrite is false, we need to include app.php
$route_prefix = $this->phpbb_root_path;
if (empty($this->config['enable_mod_rewrite']))
{
$route_prefix .= 'app.' . $this->php_ext . '/';
}
return append_sid($route_prefix . $route_url . $anchor, false, $is_amp, $session_id);
return append_sid($route_url . $anchor, false, $is_amp, $session_id, true);
}
/**