mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
Minor changes to where template vars are assigned
git-svn-id: file:///svn/phpbb/trunk@261 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
4129a8e7bb
commit
f89e2a6d70
2 changed files with 13 additions and 8 deletions
|
@ -164,7 +164,6 @@ $template->assign_vars(array(
|
||||||
"S_TIMEZONE" => $s_timezone,
|
"S_TIMEZONE" => $s_timezone,
|
||||||
"S_LOGIN_ACTION" => append_sid("login.$phpEx"),
|
"S_LOGIN_ACTION" => append_sid("login.$phpEx"),
|
||||||
"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"),
|
"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"),
|
||||||
"S_PROFILE_ACTION" => append_sid("profile.$phpEx"),
|
|
||||||
|
|
||||||
"T_HEAD_STYLESHEET" => $theme['head_stylesheet'],
|
"T_HEAD_STYLESHEET" => $theme['head_stylesheet'],
|
||||||
"T_BODY_BACKGROUND" => $theme['body_background'],
|
"T_BODY_BACKGROUND" => $theme['body_background'],
|
||||||
|
|
|
@ -276,8 +276,10 @@ switch($mode)
|
||||||
"L_OCCUPATION" => $l_occupation,
|
"L_OCCUPATION" => $l_occupation,
|
||||||
"OCCUPATION" => stripslashes($profiledata['user_occ']),
|
"OCCUPATION" => stripslashes($profiledata['user_occ']),
|
||||||
"L_INTERESTS" => $l_interests,
|
"L_INTERESTS" => $l_interests,
|
||||||
"INTERESTS" => stripslashes($profiledata['user_interests'])
|
"INTERESTS" => stripslashes($profiledata['user_interests']),
|
||||||
));
|
|
||||||
|
"S_PROFILE_ACTION" => append_sid("profile.$phpEx"))
|
||||||
|
);
|
||||||
|
|
||||||
$template->pparse("body");
|
$template->pparse("body");
|
||||||
include('includes/page_tail.'.$phpEx);
|
include('includes/page_tail.'.$phpEx);
|
||||||
|
@ -287,7 +289,7 @@ switch($mode)
|
||||||
|
|
||||||
if(!$userdata['session_logged_in'])
|
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";
|
$pagetype = "register";
|
||||||
$page_title = "$l_register";
|
$page_title = "$l_register";
|
||||||
|
@ -378,7 +380,6 @@ switch($mode)
|
||||||
$template->pparse("reg_header");
|
$template->pparse("reg_header");
|
||||||
|
|
||||||
include('includes/page_tail.'.$phpEx);
|
include('includes/page_tail.'.$phpEx);
|
||||||
exit();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -490,7 +491,10 @@ switch($mode)
|
||||||
"L_PROFILE_INFO" => $l_profile_info,
|
"L_PROFILE_INFO" => $l_profile_info,
|
||||||
"L_PROFILE_INFO_NOTICE" => $l_profile_info_notice,
|
"L_PROFILE_INFO_NOTICE" => $l_profile_info_notice,
|
||||||
"L_CONFIRM" => $l_confirm,
|
"L_CONFIRM" => $l_confirm,
|
||||||
"L_EMAIL_ADDRESS" => $l_emailaddress));
|
"L_EMAIL_ADDRESS" => $l_emailaddress,
|
||||||
|
|
||||||
|
"S_PROFILE_ACTION" => append_sid("profile.$phpEx"))
|
||||||
|
);
|
||||||
|
|
||||||
$template->pparse("body");
|
$template->pparse("body");
|
||||||
include('includes/page_tail.'.$phpEx);
|
include('includes/page_tail.'.$phpEx);
|
||||||
|
@ -647,7 +651,6 @@ switch($mode)
|
||||||
$template->pparse("reg_header");
|
$template->pparse("reg_header");
|
||||||
|
|
||||||
include('includes/page_tail.'.$phpEx);
|
include('includes/page_tail.'.$phpEx);
|
||||||
exit();
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -743,7 +746,10 @@ switch($mode)
|
||||||
"L_PROFILE_INFO" => $l_profile_info,
|
"L_PROFILE_INFO" => $l_profile_info,
|
||||||
"L_PROFILE_INFO_NOTICE" => $l_profile_info_notice,
|
"L_PROFILE_INFO_NOTICE" => $l_profile_info_notice,
|
||||||
"L_CONFIRM" => $l_confirm,
|
"L_CONFIRM" => $l_confirm,
|
||||||
"L_EMAIL_ADDRESS" => $l_emailaddress));
|
"L_EMAIL_ADDRESS" => $l_emailaddress,
|
||||||
|
|
||||||
|
"S_PROFILE_ACTION" => append_sid("profile.$phpEx"))
|
||||||
|
);
|
||||||
|
|
||||||
$template->pparse("body");
|
$template->pparse("body");
|
||||||
include('includes/page_tail.'.$phpEx);
|
include('includes/page_tail.'.$phpEx);
|
||||||
|
|
Loading…
Add table
Reference in a new issue