mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
Some xenophobia
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8611 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -1829,7 +1829,10 @@ function redirect($url, $return = false)
|
||||
}
|
||||
else if (!empty($url_parts['scheme']) && !empty($url_parts['host']))
|
||||
{
|
||||
// Full URL
|
||||
if ($url_parts['host'] !== $user->host)
|
||||
{
|
||||
$url = generate_board_url(true);
|
||||
}
|
||||
}
|
||||
else if ($url[0] == '/')
|
||||
{
|
||||
@@ -2045,11 +2048,14 @@ function meta_refresh($time, $url)
|
||||
global $template;
|
||||
|
||||
$url = redirect($url, true);
|
||||
$url = str_replace('&', '&', $url);
|
||||
|
||||
// For XHTML compatibility we change back & to &
|
||||
$template->assign_vars(array(
|
||||
'META' => '<meta http-equiv="refresh" content="' . $time . ';url=' . str_replace('&', '&', $url) . '" />')
|
||||
'META' => '<meta http-equiv="refresh" content="' . $time . ';url=' . $url . '" />')
|
||||
);
|
||||
|
||||
return $url;
|
||||
}
|
||||
|
||||
//Form validation
|
||||
@@ -2331,7 +2337,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
|
||||
return;
|
||||
}
|
||||
|
||||
meta_refresh(3, $redirect);
|
||||
$redirect = meta_refresh(3, $redirect);
|
||||
trigger_error($message . '<br /><br />' . sprintf($l_redirect, '<a href="' . $redirect . '">', '</a>'));
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user