aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/usercp_email.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-04-20 00:22:29 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-04-20 00:22:29 +0000
commit5b0bba72b1c619af2f39859ec0c262f860f991ac (patch)
tree9fb003cf223ff6bf2e26feb78a35603dff88a471 /phpBB/includes/usercp_email.php
parent65aa92182826eb06830626df49ab7a0210b06718 (diff)
downloadforums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar
forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.gz
forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.bz2
forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.xz
forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.zip
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
git-svn-id: file:///svn/phpbb/trunk@2532 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/usercp_email.php')
-rw-r--r--phpBB/includes/usercp_email.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/usercp_email.php b/phpBB/includes/usercp_email.php
index 7970c4f1c8..0878da61ba 100644
--- a/phpBB/includes/usercp_email.php
+++ b/phpBB/includes/usercp_email.php
@@ -27,12 +27,6 @@ if ( !defined('IN_PHPBB') )
exit;
}
-if ( !$userdata['session_logged_in'] )
-{
- header('Location: ' . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=email&" . POST_USERS_URL . "=$user_id", true));
- exit;
-}
-
if ( !empty($HTTP_GET_VARS[POST_USERS_URL]) || !empty($HTTP_POST_VARS[POST_USERS_URL]) )
{
$user_id = ( !empty($HTTP_GET_VARS[POST_USERS_URL]) ) ? $HTTP_GET_VARS[POST_USERS_URL] : $HTTP_POST_VARS[POST_USERS_URL];
@@ -42,6 +36,12 @@ else
message_die(GENERAL_MESSAGE, $lang['No_user_specified']);
}
+if ( !$userdata['session_logged_in'] )
+{
+ header('Location: ' . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=email&" . POST_USERS_URL . "=$user_id", true));
+ exit;
+}
+
$sql = "SELECT username, user_email, user_viewemail, user_lang
FROM " . USERS_TABLE . "
WHERE user_id = $user_id";