makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 13:58:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed unneeded decoding, added bbcode_uid to the second_pass function. (doh)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@3862 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud 2003-04-16 22:32:20 +00:00
parent 126eb0979f
commit ce8eab90fb
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/functions_posting.php
View file

@ -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