[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.133,1.133.2.1 functions_search.php,1.8,1.8.2.1

[James A. <th...@us...>]

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

Modified Files:
      Tag: phpBB-2_0_0
	functions.php functions_search.php 
Log Message:
Fixed bug #19, simple header not showing in error messages that needed it


Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.133
retrieving revision 1.133.2.1
diff -C2 -r1.133 -r1.133.2.1
*** functions.php	2 Apr 2002 14:02:27 -0000	1.133
--- functions.php	15 Apr 2002 14:48:41 -0000	1.133.2.1
***************
*** 492,496 ****
  function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '')
  {
! 	global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links;
  	global $userdata, $user_ip, $session_length;
  	global $starttime;
--- 492,496 ----
  function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '')
  {
! 	global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header;
  	global $userdata, $user_ip, $session_length;
  	global $starttime;

Index: functions_search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_search.php,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** functions_search.php	2 Apr 2002 14:03:49 -0000	1.8
--- functions_search.php	15 Apr 2002 14:48:42 -0000	1.8.2.1
***************
*** 429,433 ****
  {
  	global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path;
! 	global $starttime;
  
  	$username_list = '';
--- 429,435 ----
  {
  	global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path;
! 	global $starttime, $gen_simple_header;
! 	
! 	$gen_simple_header = TRUE;
  
  	$username_list = '';
***************
*** 460,464 ****
  	}
  
- 	$gen_simple_header = TRUE;
  	$page_title = $lang['Search'];
  	include($phpbb_root_path . 'includes/page_header.'.$phpEx);
--- 462,465 ----