[mxbb-commits] core/includes mx_functions_style.php,1.26,1.27

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

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

Modified Files:
	mx_functions_style.php 
Log Message:


Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** mx_functions_style.php	16 Dec 2007 16:15:49 -0000	1.26
--- mx_functions_style.php	17 Dec 2007 01:02:46 -0000	1.27
***************
*** 540,544 ****
  			if ( !empty($this->data['user_lang']))
  			{
! 				$this->lang['default_lang'] = phpBB2::phpbb_ltrim(basename(phpBB2::phpbb_rtrim($this->data['user_lang'])), "'");
  			}
  
--- 540,558 ----
  			if ( !empty($this->data['user_lang']))
  			{
! 			
! 				switch (PORTAL_BACKEND)
! 				{
! 					case 'internal':
! 
! 					case 'phpbb2':
! 
! 						$this->lang['default_lang'] = phpBB2::phpbb_ltrim(basename(phpBB2::phpbb_rtrim($this->data['user_lang'])), "'");
! 						break;
! 
! 					case 'phpbb3':
! 
! 						$this->lang['default_lang'] = $this->data['user_lang'];
! 						break;
! 				}
  			}
  
***************
*** 629,634 ****
  		if( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'includes/shared/phpbb2/language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx)) )
  		{
! 			@mx_message_die(GENERAL_ERROR, "Could not locate user language file: lang_main.php that most be uploaded in your includes/shared/phpbb2/language/your_language/ folder");
! 			$board_config['default_lang'] = 'english';
  		}
  		
--- 643,648 ----
  		if( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'includes/shared/phpbb2/language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx)) )
  		{
! 			mx_message_die(GENERAL_ERROR, "Could not locate user language file: lang_main.php that most be uploaded in your includes/shared/phpbb2/language/your_language/ folder", "", __LINE__, __FILE__, $board_config['default_lang']);
! 			//$board_config['default_lang'] = 'english';
  		}