[mxbb-commits] core/includes mx_functions_phpbb.php,1.31,1.32

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

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

Modified Files:
	mx_functions_phpbb.php 
Log Message:
Bug 46. Validated includes for bbcode.php

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** mx_functions_phpbb.php	4 Jun 2007 21:14:02 -0000	1.31
--- mx_functions_phpbb.php	19 Jun 2007 20:42:00 -0000	1.32
***************
*** 25,29 ****
  function mx_smilies_pass($message)
  {
! 	global $board_config;
  	$smilies_path = $board_config['smilies_path'];
  	$board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path'];
--- 25,35 ----
  function mx_smilies_pass($message)
  {
! 	global $board_config, $phpbb_root_path, $phpEx;
! 
! 	if( !function_exists('smilies_pass') )
! 	{
! 		include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx);
! 	}
! 
  	$smilies_path = $board_config['smilies_path'];
  	$board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path'];
***************
*** 44,48 ****
  {
  	global $board_config, $template, $phpbb_root_path, $phpEx;
! 	include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx);
  
  	$smilies_path = $board_config['smilies_path'];
--- 50,58 ----
  {
  	global $board_config, $template, $phpbb_root_path, $phpEx;
! 
! 	if( !function_exists('generate_smilies') )
! 	{
! 		include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx);
! 	}
  
  	$smilies_path = $board_config['smilies_path'];