diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-05-06 22:29:28 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-05-06 22:29:28 +0000 |
| commit | f89e2a6d7003ccad57afa02696cb667cf3f163f4 (patch) | |
| tree | 0e06e3ef3993cd2fbb8baad73582ca01fd2807e3 | |
| parent | 4129a8e7bb90dc57cddb22f0bc15c2a84a7b1956 (diff) | |
| download | forums-f89e2a6d7003ccad57afa02696cb667cf3f163f4.tar forums-f89e2a6d7003ccad57afa02696cb667cf3f163f4.tar.gz forums-f89e2a6d7003ccad57afa02696cb667cf3f163f4.tar.bz2 forums-f89e2a6d7003ccad57afa02696cb667cf3f163f4.tar.xz forums-f89e2a6d7003ccad57afa02696cb667cf3f163f4.zip | |
Minor changes to where template vars are assigned
git-svn-id: file:///svn/phpbb/trunk@261 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/page_header.php | 1 | ||||
| -rw-r--r-- | phpBB/profile.php | 20 |
2 files changed, 13 insertions, 8 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php index 7daa560ded..2325acd047 100644 --- a/phpBB/includes/page_header.php +++ b/phpBB/includes/page_header.php @@ -164,7 +164,6 @@ $template->assign_vars(array( "S_TIMEZONE" => $s_timezone, "S_LOGIN_ACTION" => append_sid("login.$phpEx"), "S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"), - "S_PROFILE_ACTION" => append_sid("profile.$phpEx"), "T_HEAD_STYLESHEET" => $theme['head_stylesheet'], "T_BODY_BACKGROUND" => $theme['body_background'], diff --git a/phpBB/profile.php b/phpBB/profile.php index fdffba603f..3c8763b33b 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -276,8 +276,10 @@ switch($mode) "L_OCCUPATION" => $l_occupation, "OCCUPATION" => stripslashes($profiledata['user_occ']), "L_INTERESTS" => $l_interests, - "INTERESTS" => stripslashes($profiledata['user_interests']) - )); + "INTERESTS" => stripslashes($profiledata['user_interests']), + + "S_PROFILE_ACTION" => append_sid("profile.$phpEx")) + ); $template->pparse("body"); include('includes/page_tail.'.$phpEx); @@ -287,7 +289,7 @@ switch($mode) if(!$userdata['session_logged_in']) { - header("Location: login.$phpEx?forward_page=$PHP_SELF&mode=editprofile"); + header(append_sid("Location: login.$phpEx?forward_page=$PHP_SELF&mode=editprofile")); } $pagetype = "register"; $page_title = "$l_register"; @@ -378,7 +380,6 @@ switch($mode) $template->pparse("reg_header"); include('includes/page_tail.'.$phpEx); - exit(); } } else @@ -490,7 +491,10 @@ switch($mode) "L_PROFILE_INFO" => $l_profile_info, "L_PROFILE_INFO_NOTICE" => $l_profile_info_notice, "L_CONFIRM" => $l_confirm, - "L_EMAIL_ADDRESS" => $l_emailaddress)); + "L_EMAIL_ADDRESS" => $l_emailaddress, + + "S_PROFILE_ACTION" => append_sid("profile.$phpEx")) + ); $template->pparse("body"); include('includes/page_tail.'.$phpEx); @@ -647,7 +651,6 @@ switch($mode) $template->pparse("reg_header"); include('includes/page_tail.'.$phpEx); - exit(); } else { @@ -743,7 +746,10 @@ switch($mode) "L_PROFILE_INFO" => $l_profile_info, "L_PROFILE_INFO_NOTICE" => $l_profile_info_notice, "L_CONFIRM" => $l_confirm, - "L_EMAIL_ADDRESS" => $l_emailaddress)); + "L_EMAIL_ADDRESS" => $l_emailaddress, + + "S_PROFILE_ACTION" => append_sid("profile.$phpEx")) + ); $template->pparse("body"); include('includes/page_tail.'.$phpEx); |