[mxbb-commits] core/includes mx_functions_ch.php,1.3,1.4

[Andrew <men...@us...>]

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

Modified Files:
	mx_functions_ch.php 
Log Message:
selven's fixes. Documented here: http://www.mx-system.com/forum/viewtopic.php?t=8018 .

Index: mx_functions_ch.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_ch.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mx_functions_ch.php	1 Oct 2005 14:10:45 -0000	1.3
--- mx_functions_ch.php	18 Dec 2005 18:24:27 -0000	1.4
***************
*** 46,52 ****
  
  // let's run the upgrade script
! if ( !defined('IN_LOGIN') && !defined('IN_INSTALL') && (($config->data['mod_cat_hierarchy'] != '2.1.0f') || defined('RUN_CH_INSTALL')) )
  {
! 	header('Location: '.$phpbb_root_path.'install_cat/install.' . $phpEx . (empty($SID) ? '' : '?' . $SID));
  	exit;
  }
--- 46,52 ----
  
  // let's run the upgrade script
! if ( !defined('IN_LOGIN') && !defined('IN_INSTALL') && (($config->data['mod_cat_hierarchy'] != CH_CURRENT_VERSION) || defined('RUN_CH_INSTALL')) )
  {
! 	header('Location: ./install_cat/install.' . $phpEx . (empty($SID) ? '' : '?' . $SID));
  	exit;
  }
***************
*** 75,77 ****
--- 75,92 ----
  $message_queue = !defined('CH_message_queue') ? '' : new message_queue();
  
+ // include extra language key
+ $language = $userdata['user_lang'];
+ 
+ if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) )
+ {
+    $language = $board_config['default_lang'];
+ }
+ 
+ if( !file_exists($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.'.$phpEx) )
+ {
+    $language = 'english';
+ }
+ 
+ include($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.' . $phpEx);
+ 
  ?>
\ No newline at end of file