From 6c7d359a841e9167246f99aeb8e27ba702e56113 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Sun, 14 Oct 2001 15:48:38 +0000
Subject: [PATCH] Various updates mainly to message die for admin compatibility

git-svn-id: file:///svn/phpbb/trunk@1182 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions.php | 23 +++++++++++++++++++----
 1 file 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)