[mxbb-commits] mx_kb/kb kb_common.php,1.7,1.8

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_kb/kb
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21873/modules/mx_kb/kb

Modified Files:
	kb_common.php 
Log Message:


Index: kb_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/kb_common.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** kb_common.php	8 Jul 2006 10:21:36 -0000	1.7
--- kb_common.php	1 Aug 2006 21:00:38 -0000	1.8
***************
*** 32,35 ****
--- 32,36 ----
  	}
  }
+ 
  // ===================================================
  // to make it work with php version under 4.1 and other stuff
***************
*** 61,84 ****
  
  // ===================================================
! // Include kb data
  // ===================================================
  include_once( $module_root_path . 'kb/includes/kb_constants.' . $phpEx );
  include_once( $module_root_path . 'kb/includes/functions.' . $phpEx );
- include_once( $module_root_path . 'kb/includes/functions_cache.' . $phpEx );
  include_once( $module_root_path . 'kb/includes/functions_auth.' . $phpEx );
! include_once( $module_root_path . 'kb/includes/functions_mx.' . $phpEx );
  include_once( $module_root_path . 'kb/includes/functions_kb.' . $phpEx );
  
! if (defined( 'IN_ADMIN' ))
! {
! 	include_once( $module_root_path . 'kb/includes/functions_admin.' . $phpEx );
! 	$mx_kb = new mx_kb_admin();
! }
! else
! {
! 	$mx_kb = new mx_kb_public();
! }
! 
! $mx_kb_cache = new mx_kb_cache();
  $mx_kb_functions = new mx_kb_functions();
  
--- 62,89 ----
  
  // ===================================================
! // Include Files
  // ===================================================
  include_once( $module_root_path . 'kb/includes/kb_constants.' . $phpEx );
+ 
+ //
+ // Load addon tools
+ //
+ // - Class module_cache
+ // - Class mx_custom_fields
+ // - Class mx_notification
+ // - Class mx_text
+ // - Class mx_text_formatting
+ //
+ include_once( $mx_root_path . 'includes/mx_functions_tools.' . $phpEx );
+ 
  include_once( $module_root_path . 'kb/includes/functions.' . $phpEx );
  include_once( $module_root_path . 'kb/includes/functions_auth.' . $phpEx );
! //include_once( $module_root_path . 'kb/includes/functions_mx.' . $phpEx );
  include_once( $module_root_path . 'kb/includes/functions_kb.' . $phpEx );
  
! // ===================================================
! // Load classes
! // ===================================================
! $mx_kb_cache = new module_cache($module_root_path . 'kb/');
  $mx_kb_functions = new mx_kb_functions();
  
***************
*** 114,116 ****
--- 119,131 ----
  	$smilies_on = $kb_config['allow_smilies'] ? true : false;
  }
+ 
+ if (defined( 'IN_ADMIN' ))
+ {
+ 	include_once( $module_root_path . 'kb/includes/functions_admin.' . $phpEx );
+ 	$mx_kb = new mx_kb_admin();
+ }
+ else
+ {
+ 	$mx_kb = new mx_kb_public();
+ }
  ?>
\ No newline at end of file