[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.73,1.74

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv14671/includes

Modified Files:
	functions.php 
Log Message:
Various updates mainly to message die for admin compatibility

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -r1.73 -r1.74
*** functions.php	2001/10/11 12:17:15	1.73
--- functions.php	2001/10/14 15:48:38	1.74
***************
*** 120,124 ****
  function make_jumpbox($match_forum_id = 0)
  {
! 	global $lang, $db;
  
  	$sql = "SELECT c.cat_id, c.cat_title, c.cat_order
--- 120,124 ----
  function make_jumpbox($match_forum_id = 0)
  {
! 	global $lang, $db, $SID;
  
  	$sql = "SELECT c.cat_id, c.cat_title, c.cat_order
***************
*** 177,180 ****
--- 177,185 ----
  	}
  
+ 	if( isset($SID) )
+ 	{
+ //		$boxstring .= '<input type="hidden" name="sid" value="' . $SID . '" />';
+ 	}
+ 
  	return($boxstring);
  }
***************
*** 1166,1172 ****
  		}
  
! 		$template->set_filenames(array(
! 			"message_body" => "message_body.tpl")
! 		);
  		$template->assign_vars(array(
  			"MESSAGE_TITLE" => $msg_title,
--- 1171,1187 ----
  		}
  
! 		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,