makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11508] Use $phpbb_path_helper.

Browse source 
PHPBB3-11508
This commit is contained in:
Cesar G 2014-04-22 12:40:28 -07:00
parent e287eea2c6
commit c2ac76e8b1
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/includes/functions.php
View file

@ -2344,10 +2344,9 @@ function reapply_sid($url)
*/
function build_url($strip_vars = false)
{
global $config, $user, $phpbb_container;
global $config, $user, $phpbb_path_helper;
$path_helper = $phpbb_container->get('path_helper');
$php_ext = $path_helper->get_php_ext();
$php_ext = $phpbb_path_helper->get_php_ext();
$page = $user->page['page'];
// We need to be cautious here.
@ -2365,7 +2364,7 @@ function build_url($strip_vars = false)
$page = substr($page, strlen('app.' . $php_ext . '/'));
}
$page = $path_helper->get_phpbb_root_path() . $page;
$page = $phpbb_path_helper->get_phpbb_root_path() . $page;
}
// Append SID
@ -2373,7 +2372,7 @@ function build_url($strip_vars = false)
if ($strip_vars !== false)
{
$redirect = $path_helper->strip_url_params($redirect, $strip_vars, false);
$redirect = $phpbb_path_helper->strip_url_params($redirect, $strip_vars, false);
}
return $redirect . ((strpos($redirect, '?') === false) ? '?' : '');

5
phpBB/includes/functions_content.php
View file

@ -110,7 +110,7 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key,
*/
function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list = false, $force_display = false)
{
global $config, $auth, $template, $user, $db, $phpbb_container;
global $config, $auth, $template, $user, $db, $phpbb_path_helper;
// We only return if the jumpbox is not forced to be displayed (in case it is needed for functionality)
if (!$config['load_jumpbox'] && $force_display === false)
@ -196,8 +196,7 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list
$db->sql_freeresult($result);
unset($padding_store);
$path_helper = $phpbb_container->get('path_helper');
$url_parts = $path_helper->get_url_parts($action);
$url_parts = $phpbb_path_helper->get_url_parts($action);
$template->assign_vars(array(
'S_DISPLAY_JUMPBOX' => $display_jumpbox,