mirror of
https://github.com/phpbb/phpbb.git
synced 2025-02-24 03:54:10 +01:00
Various updates mainly to message die for admin compatibility
git-svn-id: file:///svn/phpbb/trunk@1182 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
3537319489
commit
6c7d359a84
@ -119,7 +119,7 @@ function get_userdata($username) {
|
||||
|
||||
function make_jumpbox($match_forum_id = 0)
|
||||
{
|
||||
global $lang, $db;
|
||||
global $lang, $db, $SID;
|
||||
|
||||
$sql = "SELECT c.cat_id, c.cat_title, c.cat_order
|
||||
FROM " . CATEGORIES_TABLE . " c, " . FORUMS_TABLE . " f
|
||||
@ -176,6 +176,11 @@ function make_jumpbox($match_forum_id = 0)
|
||||
$boxstring .= '<select><option value="-1">-- ! No Categories ! --</option></select>';
|
||||
}
|
||||
|
||||
if( isset($SID) )
|
||||
{
|
||||
// $boxstring .= '<input type="hidden" name="sid" value="' . $SID . '" />';
|
||||
}
|
||||
|
||||
return($boxstring);
|
||||
}
|
||||
|
||||
@ -1165,9 +1170,19 @@ function message_die($msg_code, $msg_text = "", $msg_title = "", $err_line = "",
|
||||
$msg_text = $lang[$msg_text];
|
||||
}
|
||||
|
||||
$template->set_filenames(array(
|
||||
"message_body" => "message_body.tpl")
|
||||
);
|
||||
if( !defined("IN_ADMIN") )
|
||||
{
|
||||
$template->set_filenames(array(
|
||||
"message_body" => "message_body.tpl")
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
$template->set_filenames(array(
|
||||
"message_body" => "admin/admin_message_body.tpl")
|
||||
);
|
||||
}
|
||||
|
||||
$template->assign_vars(array(
|
||||
"MESSAGE_TITLE" => $msg_title,
|
||||
"MESSAGE_TEXT" => $msg_text)
|
||||
|
Loading…
x
Reference in New Issue
Block a user