diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-08-22 21:26:06 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-08-22 21:26:06 +0000 |
| commit | 1d42d1b9817050974c8bc8b91bc34a6c3cfbfef8 (patch) | |
| tree | a5788f8c1db67b7ea6cfb870b1400e28df15ee3a /phpBB/includes/functions.php | |
| parent | b0afc8e6320598734ae20e664be9f840ca501f91 (diff) | |
| download | forums-1d42d1b9817050974c8bc8b91bc34a6c3cfbfef8.tar forums-1d42d1b9817050974c8bc8b91bc34a6c3cfbfef8.tar.gz forums-1d42d1b9817050974c8bc8b91bc34a6c3cfbfef8.tar.bz2 forums-1d42d1b9817050974c8bc8b91bc34a6c3cfbfef8.tar.xz forums-1d42d1b9817050974c8bc8b91bc34a6c3cfbfef8.zip | |
some updates. Also adjusted the utf tools and normalizer more to our coding guidelines.
git-svn-id: file:///svn/phpbb/trunk@6312 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 84de408eb9..8affabc8c9 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -15,7 +15,7 @@ * * Set variable, used by {@link request_var the request_var function} * -* @access: private +* @access private */ function set_var(&$result, $var, $type, $multibyte = false) { @@ -1865,7 +1865,8 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa if (!$redirect) { // We just use what the session code determined... - $redirect = $user->page['page_name'] . (($user->page['query_string']) ? '?' . $user->page['query_string'] : ''); + // We do not append the phpbb_root_path directory because we are within the root dir if the redirect happens and not within the current directory. + $redirect = (($user->page['page_dir']) ? $user->page['page_dir'] . '/' : '') . $user->page['page_name'] . (($user->page['query_string']) ? '?' . $user->page['query_string'] : ''); } $s_hidden_fields = build_hidden_fields(array('redirect' => $redirect, 'sid' => $user->session_id)); |