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

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

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

Modified Files:
	mx_functions_ch.php 
Log Message:
Compatibility with CH fix; thanks to selven for this one.
Also note that I added $phpbb_root_path in case...

Index: mx_functions_ch.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_ch.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mx_functions_ch.php	18 Dec 2005 18:24:27 -0000	1.4
--- mx_functions_ch.php	22 Dec 2005 18:09:00 -0000	1.5
***************
*** 48,52 ****
  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;
  }
--- 48,52 ----
  if ( !defined('IN_LOGIN') && !defined('IN_INSTALL') && (($config->data['mod_cat_hierarchy'] != CH_CURRENT_VERSION) || defined('RUN_CH_INSTALL')) )
  {
! 	header('Location: ' . $phpbb_root_path . 'install_cat/install.' . $phpEx . (empty($SID) ? '' : '?' . $SID));
  	exit;
  }
***************
*** 90,92 ****
--- 90,107 ----
  include($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.' . $phpEx);
  
+ // 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