From 5776168e55ee350fa3c0e55dfb50a8d75d2ffb2c Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Thu, 28 Nov 2002 02:47:08 +0000 Subject: [PATCH] That's it for me tonight ... come back tomorrow for another thrilling installment in the "phpBB2 bug show" git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3139 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 3 ++- phpBB/login.php | 5 +++-- phpBB/templates/subSilver/viewtopic_body.tpl | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index e9a58c9bd9..a476951d2a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -117,7 +117,8 @@ h3 {font-size:12pt;color:blue}
  • Fixed non-XHTML compliant img tags in privmsg.php
  • Fixed non-deletion of announcements and polls when removing forum contents in forum admin
  • Fixed non-pruning of watched topics table when pruning related topics
    • -
  • +
  • Enable GET redirect on logout
    • +
  • Added check for IE6.x to viewtopic ICQ indicator javascript
  • diff --git a/phpBB/login.php b/phpBB/login.php index d20e32fd07..2aee65ffc2 100644 --- a/phpBB/login.php +++ b/phpBB/login.php @@ -131,9 +131,10 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($ session_end($userdata['session_id'], $userdata['user_id']); } - if( !empty($HTTP_POST_VARS['redirect']) ) + if (!empty($HTTP_POST_VARS['redirect']) || !empty($HTTP_GET_VARS['redirect'])) { - header($header_location . append_sid($HTTP_POST_VARS['redirect'], true)); + $redirect = (!empty($HTTP_POST_VARS['redirect'])) ? $HTTP_POST_VARS['redirect'] : $HTTP_GET_VARS['redirect'] + header($header_location . append_sid($redirect, true)); exit; } else diff --git a/phpBB/templates/subSilver/viewtopic_body.tpl b/phpBB/templates/subSilver/viewtopic_body.tpl index 2a06ba932f..dac8e5e2b2 100644 --- a/phpBB/templates/subSilver/viewtopic_body.tpl +++ b/phpBB/templates/subSilver/viewtopic_body.tpl @@ -46,7 +46,7 @@ {postrow.PROFILE_IMG} {postrow.PM_IMG} {postrow.EMAIL_IMG} {postrow.WWW_IMG} {postrow.AIM_IMG} {postrow.YIM_IMG} {postrow.MSN_IMG}