From c2ac76e8b11c0cfb5917febe90f56216d74bc10a Mon Sep 17 00:00:00 2001 From: Cesar G Date: Tue, 22 Apr 2014 12:40:28 -0700 Subject: [ticket/11508] Use $phpbb_path_helper. PHPBB3-11508 --- phpBB/includes/functions.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 17cc109432..6e5f6896a6 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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) ? '?' : ''); -- cgit v1.2.1