mirror of
https://github.com/phpbb/phpbb.git
synced 2025-10-04 19:51:39 +02:00
Ok, fixing a few bugs here.... I still have more to do, but this fixes a
funny bug in login.php where redirect won't allow more than the file and mode... Now it should work with posting (or any other page). Also fixes a typo in admin_db_utilities.php. P.S. James, don't commit config.php. ;) Fortunately, it didn't seem like you lost a password.... :D git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@2648 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -98,7 +98,8 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($
|
||||
else
|
||||
{
|
||||
$redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : '';
|
||||
|
||||
$redirect = str_replace("?", "&", $redirect);
|
||||
|
||||
$template->assign_vars(array(
|
||||
'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
|
||||
);
|
||||
@@ -112,6 +113,7 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($
|
||||
else
|
||||
{
|
||||
$redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : "";
|
||||
$redirect = str_replace("?", "&", $redirect);
|
||||
|
||||
$template->assign_vars(array(
|
||||
'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
|
||||
@@ -176,7 +178,6 @@ else
|
||||
if( preg_match("/^redirect=(.*)$/si", $forward_to, $forward_matches) )
|
||||
{
|
||||
$forward_to = ( !empty($forward_matches[3]) ) ? $forward_matches[3] : $forward_matches[1];
|
||||
|
||||
$forward_match = explode('&', $forward_to);
|
||||
|
||||
if(count($forward_match) > 1)
|
||||
@@ -194,7 +195,6 @@ else
|
||||
$forward_page .= $forward_match[$i];
|
||||
}
|
||||
}
|
||||
|
||||
$forward_page = $forward_match[0] . '?' . $forward_page;
|
||||
}
|
||||
else
|
||||
|
Reference in New Issue
Block a user