aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/posting.php
diff options
context:
space:
mode:
authornatec <natec@users.sourceforge.net>2001-12-11 08:55:17 +0000
committernatec <natec@users.sourceforge.net>2001-12-11 08:55:17 +0000
commit01b7683c36a3f065de20e037576fa04ae23b34fb (patch)
tree853ac69a1983694e094696021dea50be34d203ca /phpBB/posting.php
parentf0bf32c5c1d7bcacab86e0623b0600c2a694303c (diff)
downloadforums-01b7683c36a3f065de20e037576fa04ae23b34fb.tar
forums-01b7683c36a3f065de20e037576fa04ae23b34fb.tar.gz
forums-01b7683c36a3f065de20e037576fa04ae23b34fb.tar.bz2
forums-01b7683c36a3f065de20e037576fa04ae23b34fb.tar.xz
forums-01b7683c36a3f065de20e037576fa04ae23b34fb.zip
bug #490286: undoing bbencode_first_pass() when bbcode was disabled is fruitless.
git-svn-id: file:///svn/phpbb/trunk@1554 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/posting.php')
-rw-r--r--phpBB/posting.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 200971dd00..604b14e98a 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -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);