[mxbb-commits] core/includes mx_functions_style.php,1.53,1.54

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

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

Modified Files:
	mx_functions_style.php 
Log Message:
switch for language files.

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** mx_functions_style.php	23 Feb 2008 19:36:12 -0000	1.53
--- mx_functions_style.php	24 Feb 2008 19:43:57 -0000	1.54
***************
*** 661,673 ****
  		$board_config['default_lang'] = $this->get_old_lang($this->lang['default_lang']); // This will expand the lang name
  
! 		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';
  		}
  
- 		include($mx_root_path . 'includes/shared/phpbb2/language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); // Also include phpBB lang keys
  		include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);
  
  		if ( defined('IN_ADMIN') )
  		{
--- 661,689 ----
  		$board_config['default_lang'] = $this->get_old_lang($this->lang['default_lang']); // This will expand the lang name
  
! 		switch (PORTAL_BACKEND)
  		{
! 			case 'internal':
! 			case 'phpbb3':
! 				$phpbb_lang_path = $mx_root_path . 'includes/shared/phpbb2/language/';
! 			break;
! 			case 'phpbb2':
! 				$phpbb_lang_path = $phpbb_root_path . 'language/';
! 			break;
! 			default:
! 				$phpbb_lang_path = $phpbb_root_path . 'language/';
! 		}
! 
! 		//Load phpBB lang keys
! 		if ((@include $phpbb_lang_path . "lang_" . $board_config['default_lang'] . "/lang_main.$phpEx") === false)
! 		{
! 			if ((@include $phpbb_lang_path . "lang_english/lang_main.$phpEx") === false)
! 			{
! 				mx_message_die(GENERAL_ERROR, 'Language file ' . $phpbb_lang_path . "lang_" . $board_config['default_lang'] . "/lang_main.$phpEx" . ' couldn\'t be opened.');
! 			}
  		}
  
  		include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);
  
+ 		//Load AdminCP lang keys
  		if ( defined('IN_ADMIN') )
  		{
***************
*** 678,682 ****
  
  			include($mx_root_path . 'includes/shared/phpbb2/language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx); // Also include phpBB lang keys
! 			include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
  		}
  
--- 694,698 ----
  
  			include($mx_root_path . 'includes/shared/phpbb2/language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx); // Also include phpBB lang keys
! 			include($phpbb_lang_path . "lang_" . $board_config['default_lang'] . "/lang_admin.$phpEx");
  		}