|
From: FlorinCB <ory...@us...> - 2008-10-07 03:20:39
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15576 Modified Files: bbcode.php Log Message: fixed smilies bbcode Index: bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/bbcode.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bbcode.php 7 Oct 2008 02:54:41 -0000 1.3 --- bbcode.php 7 Oct 2008 03:17:57 -0000 1.4 *************** *** 1376,1380 **** global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page; ! //$mytext = stripslashes($mytext); if ($bbcode_uid) --- 1376,1382 ---- global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page; ! //Do some checks ! $phpbb3_text = $bbcode_bitfield ? true : false; ! $bbcode_bitfield = ($bbcode_bitfield && (strlen($bbcode_bitfield) < 2)) ? false : $bbcode_bitfield; if ($bbcode_uid) *************** *** 1382,1389 **** $mytext = $this->bbencode_second_pass($mytext, $bbcode_uid, $bbcode_bitfield); } ! if ($smilies_on) { ! $mytext = $this->smilies_pass($mytext); } $mytext = str_replace("\n", "\n<br />\n", $mytext); return $this->make_clickable($mytext); --- 1384,1395 ---- $mytext = $this->bbencode_second_pass($mytext, $bbcode_uid, $bbcode_bitfield); } ! if ($smilies_on && $phpbb3_text) { ! $mytext = $this->smilies3_pass($mytext); } + else if ($smilies_on) + { + $mytext = $this->smilies_pass($mytext); + } $mytext = str_replace("\n", "\n<br />\n", $mytext); return $this->make_clickable($mytext); |