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

bug #489842 -- some pages were doing bbencode_second and make_click in a bad order.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1555 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
natec 2001-12-11 09:13:04 +00:00
parent 01b7683c36
commit 95679a6932
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/bbcode.php
View file

@ -578,6 +578,7 @@ function bbencode_second_pass_code($text, $uid, $bbcode_tpl)
*/ */
function make_clickable($text) function make_clickable($text)
{ {
// pad it with a space so we can match things at the start of the 1st line. // pad it with a space so we can match things at the start of the 1st line.
$ret = " " . $text; $ret = " " . $text;

6
phpBB/search.php
View file

@ -909,7 +909,7 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
$user_sig = $searchset[$i]['user_sig']; $user_sig = $searchset[$i]['user_sig'];
$user_sig_bbcode_uid = $searchset[$i]['user_sig_bbcode_uid']; $user_sig_bbcode_uid = $searchset[$i]['user_sig_bbcode_uid'];
$message = make_clickable($message);
if( count($search_string) ) if( count($search_string) )
{ {
@ -941,8 +941,10 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
if( $searchset[$i]['enable_sig'] ) if( $searchset[$i]['enable_sig'] )
{ {
$message .= "<br /><br />_________________<br />" . make_clickable($user_sig); $message .= "<br /><br />_________________<br />" . $user_sig;
} }
$message = make_clickable($message);
} }
if( count($orig_word) ) if( count($orig_word) )

5
phpBB/viewtopic.php
View file

@ -937,7 +937,6 @@ for($i = 0; $i < $total_posts; $i++)
// important, moving things around could break any // important, moving things around could break any
// output // output
// //
$message = make_clickable($message);
// //
// Highlight active words (primarily for search) // Highlight active words (primarily for search)
@ -985,9 +984,11 @@ for($i = 0; $i < $total_posts; $i++)
// //
if( $postrow[$i]['enable_sig'] && $user_sig != "" ) if( $postrow[$i]['enable_sig'] && $user_sig != "" )
{ {
$message .= "<br /><br />_________________<br />" . make_clickable($user_sig); $message .= "<br /><br />_________________<br />" . $user_sig;
} }
$message = make_clickable($message);
// //
// Replace naughty words // Replace naughty words
// //