[mxbb-commits] core/includes mx_functions_core.php, 1.57, 1.58 mx_functions_phpbb.php, 1.35, 1.36

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

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

Modified Files:
	mx_functions_core.php mx_functions_phpbb.php 
Log Message:


Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** mx_functions_core.php	13 Jan 2008 13:14:38 -0000	1.57
--- mx_functions_core.php	13 Jan 2008 18:36:28 -0000	1.58
***************
*** 65,69 ****
  		global $db;
  
! 		if (($config = $this->get('phpbb_config')) && $use_cache)
  		{
  			return $config;
--- 65,69 ----
  		global $db;
  
! 		if (($config = $this->get('phpbb_config')) && $use_cache )
  		{
  			return $config;
***************
*** 74,80 ****
  				FROM " . CONFIG_TABLE;
  
! 			if( !($result = $db->sql_query($sql)) )
  			{
! 				mx_message_die(CRITICAL_ERROR, "Could not query config information", "", __LINE__, __FILE__, $sql);
  			}
  
--- 74,87 ----
  				FROM " . CONFIG_TABLE;
  
! 			if ( !( $result = $db->sql_query( $sql ) ) )
  			{
! 				if (!function_exists('mx_message_die'))
! 				{
! 					die("Couldnt query config information, Allso this hosting or server is using a cache optimizer not compatible with mxBB or just lost connection to database wile query.");
! 				}
! 				else
! 				{
! 					mx_message_die( GENERAL_ERROR, 'Couldnt query config information', '', __LINE__, __FILE__, $sql );
! 				}
  			}
  
***************
*** 104,108 ****
  		global $db;
  
! 		if ($config = $this->get('mxbb_config'))
  		{
  			return $config;
--- 111,115 ----
  		global $db;
  
! 		if ($config = $this->get('mxbb_config') && $portal_config['portal_version'])
  		{
  			return $config;

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** mx_functions_phpbb.php	6 Jan 2008 22:28:57 -0000	1.35
--- mx_functions_phpbb.php	13 Jan 2008 18:36:28 -0000	1.36
***************
*** 308,312 ****
  	global $mx_starttime, $mx_page, $mx_block, $mx_user, $mx_request_vars, $mx_cache, $tplEx;
  
! 	$default_lang = $mx_user->get_old_lang($board_config['default_lang']);
  
  	if(defined('HAS_DIED'))
--- 308,313 ----
  	global $mx_starttime, $mx_page, $mx_block, $mx_user, $mx_request_vars, $mx_cache, $tplEx;
  
! 	//$default_lang = $mx_user->get_old_lang($board_config['default_lang']);
! 	$default_lang = $mx_user->lang['default_lang'];
  
  	if(defined('HAS_DIED'))
***************
*** 476,480 ****
  			if ( $msg_title == '' )
  			{
! 				$msg_title = 'phpBB : <b>' . $lang['Critical_Error'] . '</b>';
  			}
  			break;
--- 477,481 ----
  			if ( $msg_title == '' )
  			{
! 				$msg_title = 'mxBB : <b>' . $lang['Critical_Error'] . '</b>';
  			}
  			break;