[mxbb-commits] mx_calsnails/includes cal_functions.php,1.14,1.15

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

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

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

Index: cal_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/includes/cal_functions.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** cal_functions.php	10 Jul 2008 22:21:58 -0000	1.14
--- cal_functions.php	15 Jul 2008 22:04:04 -0000	1.15
***************
*** 233,242 ****
  	$id, $day, $month, $year, $userdata, $lang, $config_footer, $footer, $caluser, $cal_version,
  	$block_size, // MX001
! 	$endday, $endmonth, $endyear, $bbcode_uid, $homeurl, $db, $template, $mx_page;
! 
! 	if( !function_exists('generate_smilies') )
! 	{
! 		mx_cache::load_file('functions_post');
! 	}
  
  	if ( $caluser >= 4 )
--- 233,237 ----
  	$id, $day, $month, $year, $userdata, $lang, $config_footer, $footer, $caluser, $cal_version,
  	$block_size, // MX001
! 	$endday, $endmonth, $endyear, $bbcode_uid, $homeurl, $db, $template, $mx_page, $mx_bbcode;
  
  	if ( $caluser >= 4 )
***************
*** 275,279 ****
  			$smilies_path = $board_config['smilies_path'];
  			$board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path'];
! 			generate_smilies( 'inline', PAGE_POSTING );
  			$board_config['smilies_path'] = $smilies_path;
  			$template->assign_vars( array( 'U_MORE_SMILIES' => mx_append_sid( PHPBB_URL . "posting.$phpEx?mode=smilies" ) ) );
--- 270,274 ----
  			$smilies_path = $board_config['smilies_path'];
  			$board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path'];
! 			$mx_bbcode->generate_smilies( 'inline', PAGE_POSTING );
  			$board_config['smilies_path'] = $smilies_path;
  			$template->assign_vars( array( 'U_MORE_SMILIES' => mx_append_sid( PHPBB_URL . "posting.$phpEx?mode=smilies" ) ) );
***************
*** 403,407 ****
  	$id, $day, $month, $year, $userdata, $lang, $caluser, $lastday, $phpbbheaders,
  	$block_size,
! 	$endday, $endmonth, $endyear, $bbcode_uid, $db, $template, $homeurl, $HTTP_POST_VARS, $mx_page;
  
  	if ( $caluser >= 2 )
--- 398,402 ----
  	$id, $day, $month, $year, $userdata, $lang, $caluser, $lastday, $phpbbheaders,
  	$block_size,
! 	$endday, $endmonth, $endyear, $bbcode_uid, $db, $template, $homeurl, $HTTP_POST_VARS, $mx_page, $mx_bbcode;
  
  	if ( $caluser >= 2 )
***************
*** 414,425 ****
  		}
  
- 		if( !function_exists('generate_smilies') )
- 		{
- 			mx_cache::load_file('functions_post');
- 		}
- 
  		$smilies_path = $board_config['smilies_path'];
  		$board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path'];
! 		generate_smilies( 'inline', PAGE_POSTING );
  		$board_config['smilies_path'] = $smilies_path;
  		$template->assign_vars( array( 'U_MORE_SMILIES' => mx_append_sid( PHPBB_URL . "posting.$phpEx?mode=smilies" ) ) );
--- 409,415 ----
  		}
  
  		$smilies_path = $board_config['smilies_path'];
  		$board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path'];
! 		$mx_bbcode->generate_smilies( 'inline', PAGE_POSTING );
  		$board_config['smilies_path'] = $smilies_path;
  		$template->assign_vars( array( 'U_MORE_SMILIES' => mx_append_sid( PHPBB_URL . "posting.$phpEx?mode=smilies" ) ) );
***************
*** 603,617 ****
  	if( !function_exists('prepare_message') )
  	{
! 		mx_cache::load_file('functions_post');
! 	}
! 
! 	if( !function_exists('make_bbcode_uid') )
! 	{
! 		mx_cache::load_file('bbcode');
  	}
  
  	if ( !$bbcode_uid )
  	{
! 		$bbcode_uid = make_bbcode_uid();
  	}
  	// PREPARE MESSAGE
--- 593,602 ----
  	if( !function_exists('prepare_message') )
  	{
! 		mx_cache::load_file('functions_post', 'phpbb2');
  	}
  
  	if ( !$bbcode_uid )
  	{
! 		$bbcode_uid = $mx_bbcode->make_bbcode_uid();
  	}
  	// PREPARE MESSAGE