makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some xenophobia

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8611 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2008-06-06 11:27:51 +00:00
parent fa01fd7da4
commit cd058dd9fe
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/docs/CHANGELOG.html
View file

@ -114,7 +114,7 @@
<li>[Fix] corrected link for searching post author's other posts (Bug #26455)</li> <li>[Fix] corrected link for searching post author's other posts (Bug #26455)</li>
<li>[Fix] HTTP Authentication supports UTF-8 usernames now (Bug #21135)</li> <li>[Fix] HTTP Authentication supports UTF-8 usernames now (Bug #21135)</li>
<li>[Fix] Topic searches by author no longer return invalid results (Bug #11777)</li> <li>[Fix] Topic searches by author no longer return invalid results (Bug #11777)</li>
<li>[Change] Don't allow redirects to different domains. (thanks nookieman)</li>
</ul> </ul>
<a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3> <a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3>

12
phpBB/includes/functions.php
View file

@ -1829,7 +1829,10 @@ function redirect($url, $return = false)
} }
else if (!empty($url_parts['scheme']) && !empty($url_parts['host'])) 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] == '/') else if ($url[0] == '/')
{ {
@ -2045,11 +2048,14 @@ function meta_refresh($time, $url)
global $template; global $template;
$url = redirect($url, true); $url = redirect($url, true);
$url = str_replace('&', '&amp;', $url);
// For XHTML compatibility we change back & to &amp; // For XHTML compatibility we change back & to &amp;
$template->assign_vars(array( $template->assign_vars(array(
'META' => '<meta http-equiv="refresh" content="' . $time . ';url=' . str_replace('&', '&amp;', $url) . '" />') 'META' => '<meta http-equiv="refresh" content="' . $time . ';url=' . $url . '" />')
); );
return $url;
} }
//Form validation //Form validation
@ -2331,7 +2337,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
return; return;
} }
meta_refresh(3, $redirect); $redirect = meta_refresh(3, $redirect);
trigger_error($message . '<br /><br />' . sprintf($l_redirect, '<a href="' . $redirect . '">', '</a>')); trigger_error($message . '<br /><br />' . sprintf($l_redirect, '<a href="' . $redirect . '">', '</a>'));
} }