|
From: Florin C B. <ory...@us...> - 2013-06-02 12:56:28
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9912 Modified Files: bbcode.php Log Message: navigation menu upgrade to v3 Index: bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/bbcode.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** bbcode.php 26 Apr 2013 14:14:17 -0000 1.13 --- bbcode.php 2 Jun 2013 12:56:25 -0000 1.14 *************** *** 1678,1682 **** { global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page; ! if (!$mytext) { --- 1678,1682 ---- { global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page; ! if (!$mytext) { *************** *** 1690,1700 **** $bbcode_bitfield = ($bbcode_bitfield && (strlen($bbcode_bitfield) < 2)) ? false : $bbcode_bitfield; ! if ($bbcode_uid) { $mytext = $this->bbencode_second_pass($mytext, $bbcode_uid, $bbcode_bitfield); } ! $mytext = str_replace(array("\n", "\r"), array('<br />', "\n"), $mytext); ! $mytext = bbcode_nl2br($mytext); //$mytext = smiley_text($mytext, !($flags & OPTION_FLAG_SMILIES)); --- 1690,1700 ---- $bbcode_bitfield = ($bbcode_bitfield && (strlen($bbcode_bitfield) < 2)) ? false : $bbcode_bitfield; ! if (!empty($bbcode_uid)) { $mytext = $this->bbencode_second_pass($mytext, $bbcode_uid, $bbcode_bitfield); } ! $mytext = str_replace(array("\n", "\r"), array('<br />', "\n"), $mytext); ! $mytext = $this->bbcode_nl2br($mytext); //$mytext = smiley_text($mytext, !($flags & OPTION_FLAG_SMILIES)); *************** *** 1707,1713 **** $mytext = $this->smilies_pass($mytext); } ! //$mytext = str_replace("\n", "\n<br />\n", $mytext); ! if ($mytext != '') { --- 1707,1713 ---- $mytext = $this->smilies_pass($mytext); } ! //$mytext = str_replace("\n", "\n<br />\n", $mytext); ! if ($mytext != '') { |