makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

bug #490286: undoing bbencode_first_pass() when bbcode was disabled is fruitless.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1554 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
natec 2001-12-11 08:55:17 +00:00
parent f0bf32c5c1
commit 01b7683c36
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/posting.php
View file

@ -2353,6 +2353,7 @@ else
$post_subject = $postrow['post_subject'];
$post_message = $postrow['post_text'];
$post_bbcode_uid = $postrow['bbcode_uid'];
$post_bbcode_enabled = ($postrow['enable_bbcode'] == 1);
if( $mode == "editpost" )
{
@ -2365,7 +2366,10 @@ else
$user_sig = $userdata['user_sig'];
}
$post_message = preg_replace("/\:(([a-z0-9]:)?)$post_bbcode_uid/si", "", $post_message);
if ($post_bbcode_enabled)
{
$post_message = preg_replace("/\:(([a-z0-9]:)?)$post_bbcode_uid/si", "", $post_message);
}
$post_message = str_replace("<br />", "\n", $post_message);
$post_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $post_message);

9
phpBB/privmsg.php
View file

@ -1217,7 +1217,7 @@ else if( $submit || $refresh || $mode != "" )
if( $mode == "edit" )
{
$sql = "SELECT pm.privmsgs_id, pm.privmsgs_subject, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text, u.username, u.user_id, u.user_sig
$sql = "SELECT pm.*, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text, u.username, u.user_id, u.user_sig
FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u
WHERE pm.privmsgs_id = $privmsg_id
AND pmt.privmsgs_text_id = pm.privmsgs_id
@ -1238,8 +1238,13 @@ else if( $submit || $refresh || $mode != "" )
$privmsg_subject = $privmsg['privmsgs_subject'];
$privmsg_message = $privmsg['privmsgs_text'];
$privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
$privmsg_bbcode_enabled = ($privmsg['privmsgs_enable_bbcode'] == 1);
$privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message);
if ($privmsg_bbcode_enabled)
{
$privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message);
}
$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
$privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message);