diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-10-14 15:48:38 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-10-14 15:48:38 +0000 |
| commit | 6c7d359a841e9167246f99aeb8e27ba702e56113 (patch) | |
| tree | 897b6b871d05116aaa5305b53cc1f36db6266761 /phpBB/includes | |
| parent | 3537319489f651be51866dba36c981d3104681a0 (diff) | |
| download | forums-6c7d359a841e9167246f99aeb8e27ba702e56113.tar forums-6c7d359a841e9167246f99aeb8e27ba702e56113.tar.gz forums-6c7d359a841e9167246f99aeb8e27ba702e56113.tar.bz2 forums-6c7d359a841e9167246f99aeb8e27ba702e56113.tar.xz forums-6c7d359a841e9167246f99aeb8e27ba702e56113.zip | |
Various updates mainly to message die for admin compatibility
git-svn-id: file:///svn/phpbb/trunk@1182 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 2e6ac3ff1f..0723bbae58 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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) |