[mxbb-commits] core/includes mx_functions_phpbb.php,1.45,1.46

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31010

Modified Files:
	mx_functions_phpbb.php 
Log Message:
Changes to critical error

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** mx_functions_phpbb.php	14 Feb 2008 03:08:03 -0000	1.45
--- mx_functions_phpbb.php	14 Feb 2008 03:24:15 -0000	1.46
***************
*** 561,565 ****
  				if ((@include($lang_path . "lang_english/lang_main.$phpEx")) === false)
  				{
! 					die('Language file (mx_message_die) ' . $lang_path . "lang_" . $default_lang . "/lang_main.$phpEx" . ' couldn\'t be opened.');
  				}
  			}
--- 561,569 ----
  				if ((@include($lang_path . "lang_english/lang_main.$phpEx")) === false)
  				{
! 					$phpbb_lang_error = 'Language file ' . $lang_path . "lang_" . $default_lang . "/lang_main.$phpEx" . ' couldn\'t be opened.';
! 				}
! 				else
! 				{
! 					$phpbb_lang_error = false;
  				}
  			}
***************
*** 569,582 ****
  				if ((@include($mx_root_path . "language/lang_english/lang_main.$phpEx")) === false)
  				{
! 					die('Language file (mx_message_die) ' . $mx_root_path . "language/lang_" . $default_lang . "/lang_main.$phpEx" . ' couldn\'t be opened.');
  				}
  			}
  
! 			if ( $msg_text == '' )
  			{
  				$msg_text = $lang['A_critical_error'];
  			}
  
! 			if ( $msg_title == '' )
  			{
  				$msg_title = 'MX-Publisher : <b>' . $lang['Critical_Error'] . '</b>';
--- 573,590 ----
  				if ((@include($mx_root_path . "language/lang_english/lang_main.$phpEx")) === false)
  				{
! 					$mx_lang_error = 'Language file ' . $mx_root_path . "language/lang_" . $default_lang . "/lang_main.$phpEx" . ' couldn\'t be opened.';
! 				}
! 				else
! 				{
! 					$mx_lang_error = false;
  				}
  			}
  
! 			if ($msg_text == '')
  			{
  				$msg_text = $lang['A_critical_error'];
  			}
  
! 			if ($msg_title == '')
  			{
  				$msg_title = 'MX-Publisher : <b>' . $lang['Critical_Error'] . '</b>';
***************
*** 595,601 ****
  		if ( $debug_text != '' )
  		{
! 			$msg_text = $msg_text . '<br /><br /><b><u>DEBUG MODE</u></b>' . $debug_text;
  		}
  	}
  
  	if ( $msg_code != CRITICAL_ERROR )
--- 603,619 ----
  		if ( $debug_text != '' )
  		{
! 			$msg_text = $msg_text . '<br /><br /><b><u>DEBUG MODE</u></b> ' . $debug_text;
  		}
  	}
+ 	
+ 	if ($phpbb_lang_error)
+ 	{
+ 		$msg_text = $msg_text . '<br /><br /><b><u>ALLSO</u></b> ' . $phpbb_lang_error;
+ 	}
+ 
+ 	if ($mx_lang_error)
+ 	{
+ 		$msg_text = $msg_text . '<br /><br /><b><u>ALLSO</u></b> ' . $mx_lang_error;
+ 	}
  
  	if ( $msg_code != CRITICAL_ERROR )