diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-08 21:44:59 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-08 21:44:59 +0000 |
| commit | 1aa40171e0677c5307f213f8c58b7156f5885d59 (patch) | |
| tree | cf0721c95893f960cdaef194efef82698a3e824e /phpBB/includes/functions.php | |
| parent | 6a59f3efd68ad9467d053bd151273e898ce65504 (diff) | |
| download | forums-1aa40171e0677c5307f213f8c58b7156f5885d59.tar forums-1aa40171e0677c5307f213f8c58b7156f5885d59.tar.gz forums-1aa40171e0677c5307f213f8c58b7156f5885d59.tar.bz2 forums-1aa40171e0677c5307f213f8c58b7156f5885d59.tar.xz forums-1aa40171e0677c5307f213f8c58b7156f5885d59.zip | |
merge...
git-svn-id: file:///svn/phpbb/trunk@8624 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 4a42d4a211..3e1b3cf903 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1775,7 +1775,7 @@ function redirect($url, $return = false) { if ($url_parts['host'] !== $user->host) { - $url = generate_board_url(true); + $url = generate_board_url(); } } else if ($url[0] == '/') @@ -1996,7 +1996,7 @@ function meta_refresh($time, $url) $template->assign_vars(array( 'META' => '<meta http-equiv="refresh" content="' . $time . ';url=' . $url . '" />') ); - + return $url; } @@ -2182,7 +2182,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = false, $s_display = true) { global $db, $user, $template, $auth, $config; - + $err = ''; @@ -2191,7 +2191,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa { $user->setup(); } - + if (defined('ADMIN_START')) { // Set custom template for admin area @@ -2411,7 +2411,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa 'USERNAME_CREDENTIAL' => 'username', 'PASSWORD_CREDENTIAL' => ($admin) ? 'password_' . $credential : 'password', )); - + if (defined('ADMIN_START')) { $template->set_filenames(array( @@ -2431,7 +2431,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa ); page_header($user->lang['LOGIN'], false); } - + make_jumpbox(append_sid('viewforum')); if (defined('ADMIN_START') && isset($user->data['session_admin']) && $user->data['session_admin']) { @@ -2441,7 +2441,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa { page_footer(); } - + } /** |