[mxbb-commits] mx_import_tools/includes functions_mod_user.php, 1.10, 1.11

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

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

Modified Files:
	functions_mod_user.php 
Log Message:
More..

Index: functions_mod_user.php
===================================================================
RCS file: /cvsroot/mxbb/mx_import_tools/includes/functions_mod_user.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** functions_mod_user.php	10 Jul 2008 22:24:40 -0000	1.10
--- functions_mod_user.php	15 Jul 2008 22:05:21 -0000	1.11
***************
*** 17,31 ****
  if( !function_exists('validate_username') )
  {
! 	mx_cache::load_file('functions_validate');
  }
  
  if( !function_exists('prepare_message') )
  {
! 	mx_cache::load_file('functions_post');
! }
! 
! if( !function_exists('make_bbcode_uid') )
! {
! 	mx_cache::load_file('bbcode');
  }
  
--- 17,26 ----
  if( !function_exists('validate_username') )
  {
! 	mx_cache::load_file('functions_validate', 'phpbb2');
  }
  
  if( !function_exists('prepare_message') )
  {
! 	mx_cache::load_file('functions_post', 'phpbb2');
  }
  
***************
*** 48,52 ****
  	function user( $name, $password, $email )
  	{
! 		global $board_config;
  
  		$this->username = $this->sql_escape( $name );
--- 43,47 ----
  	function user( $name, $password, $email )
  	{
! 		global $board_config, $mx_bbcode;
  
  		$this->username = $this->sql_escape( $name );
***************
*** 68,72 ****
  		$user_fields['user_msnm'] = '';
  		$this->user_fields['user_sig'] = '';
! 		$this->user_fields['user_sig_bbcode_uid'] = ( $board_config['allow_bbcode'] ) ? make_bbcode_uid() : '';
  		$this->user_fields['user_avatar'] = '';
  		$this->user_fields['user_avatar_type'] = USER_AVATAR_NONE;
--- 63,67 ----
  		$user_fields['user_msnm'] = '';
  		$this->user_fields['user_sig'] = '';
! 		$this->user_fields['user_sig_bbcode_uid'] = ( $board_config['allow_bbcode'] ) ? $mx_bbcode->make_bbcode_uid() : '';
  		$this->user_fields['user_avatar'] = '';
  		$this->user_fields['user_avatar_type'] = USER_AVATAR_NONE;