mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-13 14:58:52 +00:00
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
This commit is contained in:
parent
126eb0979f
commit
ce8eab90fb
1 changed files with 1 additions and 5 deletions
|
@ -133,8 +133,6 @@ function decode_text(&$message, $bbcode_uid)
|
||||||
$server_port = ($config['server_port'] <> 80) ? ':' . trim($config['server_port']) . '/' : '/';
|
$server_port = ($config['server_port'] <> 80) ? ':' . trim($config['server_port']) . '/' : '/';
|
||||||
|
|
||||||
$match = array(
|
$match = array(
|
||||||
'#<!\-\- b \-\-><b>(.*?)</b><!\-\- b \-\->#s',
|
|
||||||
'#<!\-\- u \-\-><u>(.*?)</u><!\-\- u \-\->#s',
|
|
||||||
'#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
|
'#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
|
||||||
'#<!\-\- m \-\-><a href="(.*?)" target="_blank">.*?</a><!\-\- m \-\->#',
|
'#<!\-\- m \-\-><a href="(.*?)" target="_blank">.*?</a><!\-\- m \-\->#',
|
||||||
'#<!\-\- w \-\-><a href="http:\/\/(.*?)" target="_blank">.*?</a><!\-\- w \-\->#',
|
'#<!\-\- w \-\-><a href="http:\/\/(.*?)" target="_blank">.*?</a><!\-\- w \-\->#',
|
||||||
|
@ -143,8 +141,6 @@ function decode_text(&$message, $bbcode_uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
$replace = array(
|
$replace = array(
|
||||||
'[b]\1[/b]',
|
|
||||||
'[u]\1[/u]',
|
|
||||||
'\1',
|
'\1',
|
||||||
'\1',
|
'\1',
|
||||||
'\1',
|
'\1',
|
||||||
|
@ -559,7 +555,7 @@ function format_display($message, $html, $bbcode, $uid, $url, $smilies, $sig)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Second parse bbcode here
|
// 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
|
// If we allow users to disable display of emoticons
|
||||||
// we'll need an appropriate check and preg_replace here
|
// we'll need an appropriate check and preg_replace here
|
||||||
|
|
Loading…
Add table
Reference in a new issue