[mxbb-commits] mx_kb/kb kb_common.php,1.9.2.1,1.9.2.2

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

Update of /cvsroot/mxbb/mx_kb/kb
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5829/kb

Modified Files:
      Tag: core28x
	kb_common.php 
Log Message:
upgrade for mx_mod 2.8.2

Index: kb_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/kb_common.php,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** kb_common.php	28 Jan 2008 03:09:28 -0000	1.9.2.1
--- kb_common.php	8 Mar 2008 15:19:21 -0000	1.9.2.2
***************
*** 64,68 ****
  // Include Files
  // ===================================================
! include_once( $module_root_path . 'kb/includes/kb_constants.' . $phpEx );
  
  //
--- 64,68 ----
  // Include Files
  // ===================================================
! require($module_root_path . 'kb/includes/kb_constants.'.$phpEx);
  
  //
***************
*** 85,88 ****
--- 85,89 ----
  }
  
+ /*
  // **********************************************************************
  // If phpBB mod read language definition
***************
*** 104,107 ****
--- 105,109 ----
  //  If phpBB mod read theme definition and language in theme definition
  // **********************************************************************
+ 
  if ( !MXBB_MODULE )
  {
***************
*** 168,183 ****
  	// -------------------------------------------------------------------------
  	$current_template_images = $phpbb_root_path . $current_template_path . "/images";
- }
  
! if ( !(MXBB_MODULE) || ($images['kb_icon_edit'] == '') ) 
! {
! 	if (!MXBB_MODULE) 
! 	{
! 		@include($phpbb_root_path . $template_path . $template_name . '/' . 'kb.cfg');
! 	}
! 	else
! 	{
! 		include($module_root_path . $mx_user->current_template_path . '/' . $mx_user->template_name . '.cfg');
! 	}
  	$img_lang = ( file_exists($phpbb_root_path . $current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english';
  
--- 170,176 ----
  	// -------------------------------------------------------------------------
  	$current_template_images = $phpbb_root_path . $current_template_path . "/images";
  
! 	@include($phpbb_root_path . $template_path . $template_name . '/' . 'kb.cfg');
! 
  	$img_lang = ( file_exists($phpbb_root_path . $current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english';
  
***************
*** 201,205 ****
  	}
  }
! 
  include_once( $module_root_path . 'kb/includes/functions.' . $phpEx );
  include_once( $module_root_path . 'kb/includes/functions_auth.' . $phpEx );
--- 194,198 ----
  	}
  }
! */
  include_once( $module_root_path . 'kb/includes/functions.' . $phpEx );
  include_once( $module_root_path . 'kb/includes/functions_auth.' . $phpEx );
***************
*** 229,233 ****
  if ( $kb_config['wysiwyg'] ) // Html Textblock
  {
! 	if ( @file_exists($mx_root_path . $kb_config['wysiwyg_path'] . 'tinymce/jscripts/tiny_mce/tiny_mce.js') )
  	{
  		$bbcode_on = false;
--- 222,226 ----
  if ( $kb_config['wysiwyg'] ) // Html Textblock
  {
! 	if ( file_exists( $mx_root_path . 'modules/mx_shared/tinymce/jscripts/tiny_mce/blank.htm' ) )
  	{
  		$bbcode_on = false;