From ce8eab90fbab1d670abe24e5cbb1d88a28d5e1d9 Mon Sep 17 00:00:00 2001
From: Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net>
Date: Wed, 16 Apr 2003 22:32:20 +0000
Subject: [PATCH] Removed unneeded decoding, added bbcode_uid to the
 second_pass function. (doh)

git-svn-id: file:///svn/phpbb/trunk@3862 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions_posting.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 5b0ae41cf9..c1ccd2ab71 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -133,8 +133,6 @@ function decode_text(&$message, $bbcode_uid)
 	$server_port = ($config['server_port'] <> 80) ? ':' . trim($config['server_port']) . '/' : '/';
 
 	$match = array(
-		'#<!\-\- b \-\-><b>(.*?)</b><!\-\- b \-\->#s',
-		'#<!\-\- u \-\-><u>(.*?)</u><!\-\- u \-\->#s',
 		'#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
 		'#<!\-\- m \-\-><a href="(.*?)" target="_blank">.*?</a><!\-\- m \-\->#',
 		'#<!\-\- w \-\-><a href="http:\/\/(.*?)" target="_blank">.*?</a><!\-\- w \-\->#',
@@ -143,8 +141,6 @@ function decode_text(&$message, $bbcode_uid)
 	);
 
 	$replace = array(
-		'[b]\1[/b]',
-		'[u]\1[/u]',
 		'\1',
 		'\1',
 		'\1',
@@ -559,7 +555,7 @@ function format_display($message, $html, $bbcode, $uid, $url, $smilies, $sig)
 	}
 
 	// Second parse bbcode here
-	$message = $bbcode->bbcode_second_pass($message);
+	$message = $bbcode->bbcode_second_pass($message, $uid);
 
 	// If we allow users to disable display of emoticons
 	// we'll need an appropriate check and preg_replace here