diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-10-21 22:17:24 -0500 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-10-21 22:17:24 -0500 |
| commit | c381ad2002546042de5a71dedbea1a7d45d1e2d8 (patch) | |
| tree | 42677ed6d06641e859ed4afe59c3998d23cd9090 | |
| parent | 40497ec824344116143bc30b84fe8eb1c1971ebf (diff) | |
| download | forums-c381ad2002546042de5a71dedbea1a7d45d1e2d8.tar forums-c381ad2002546042de5a71dedbea1a7d45d1e2d8.tar.gz forums-c381ad2002546042de5a71dedbea1a7d45d1e2d8.tar.bz2 forums-c381ad2002546042de5a71dedbea1a7d45d1e2d8.tar.xz forums-c381ad2002546042de5a71dedbea1a7d45d1e2d8.zip | |
[ticket/13192] Use get_valid_user_page method in build_url function
PHPBB3-13192
| -rw-r--r-- | phpBB/includes/functions.php | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 7700dcfd27..d1d0f8f681 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2396,26 +2396,7 @@ function build_url($strip_vars = false) { global $config, $user, $phpbb_path_helper; - $php_ext = $phpbb_path_helper->get_php_ext(); - $page = $user->page['page']; - - // We need to be cautious here. - // On some situations, the redirect path is an absolute URL, sometimes a relative path - // For a relative path, let's prefix it with $phpbb_root_path to point to the correct location, - // else we use the URL directly. - $url_parts = parse_url($page); - - // URL - if ($url_parts === false || empty($url_parts['scheme']) || empty($url_parts['host'])) - { - // Remove 'app.php/' from the page, when rewrite is enabled - if ($config['enable_mod_rewrite'] && strpos($page, 'app.' . $php_ext . '/') === 0) - { - $page = substr($page, strlen('app.' . $php_ext . '/')); - } - - $page = $phpbb_path_helper->get_phpbb_root_path() . $page; - } + $page = $phpbb_path_helper->get_valid_user_page($user->page['page'], $config['enable_mod_rewrite']); // Append SID $redirect = append_sid($page, false, false); |