[mxbb-commits] core/includes/sessions/phpbb3 functions.php, 1.1, 1.2

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

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

Modified Files:
	functions.php 
Log Message:
orys update

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** functions.php	15 Jul 2008 22:03:31 -0000	1.1
--- functions.php	15 Jul 2008 22:22:24 -0000	1.2
***************
*** 266,311 ****
  	}
  }
- 
- /**
- * For display of custom parsed text on user-facing pages
- * Expects $text to be the value directly from the database (stored value)
- */
- function mx_generate_text_for_display($text, $uid, $bitfield, $flags)
- {
- 	static $bbcode, $mx_bbcode;
- 
- 	if (!$text)
- 	{
- 		return '';
- 	}
- 
- 	$text = phpbb3::censor_text($text);
- 
- 	// Parse bbcode if bbcode uid stored and bbcode enabled
- 	if ($uid && ($flags & OPTION_FLAG_BBCODE))
- 	{
- 		if (!class_exists('bbcode'))
- 		{
- 			global $phpbb_root_path, $phpEx;
- 			mx_cache::load_file('bbcode', 'phpbb3');
- 		}
- 
- 		if (empty($bbcode))
- 		{
- 			$bbcode = new bbcode($bitfield);
- 		}
- 		else
- 		{
- 			$bbcode->bbcode($bitfield);
- 		}
- 
- 		$bbcode->bbcode_second_pass($text, $uid);
- 	}
- 
- 	$text = str_replace("\n", '<br />', $text);
- 
- 	$text = $mx_bbcode->smilies_pass($text, !($flags & OPTION_FLAG_SMILIES));
- 
- 	return $text;
- }
  ?>
\ No newline at end of file
--- 266,268 ----