diff options
| author | natec <natec@users.sourceforge.net> | 2001-12-11 09:13:04 +0000 |
|---|---|---|
| committer | natec <natec@users.sourceforge.net> | 2001-12-11 09:13:04 +0000 |
| commit | 95679a693275714c7196b70dda011822b9ad6d4f (patch) | |
| tree | a4b4fe32251e6b437649261462dfa096f327c3f9 | |
| parent | 01b7683c36a3f065de20e037576fa04ae23b34fb (diff) | |
| download | forums-95679a693275714c7196b70dda011822b9ad6d4f.tar forums-95679a693275714c7196b70dda011822b9ad6d4f.tar.gz forums-95679a693275714c7196b70dda011822b9ad6d4f.tar.bz2 forums-95679a693275714c7196b70dda011822b9ad6d4f.tar.xz forums-95679a693275714c7196b70dda011822b9ad6d4f.zip | |
bug #489842 -- some pages were doing bbencode_second and make_click in a bad order.
git-svn-id: file:///svn/phpbb/trunk@1555 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/bbcode.php | 1 | ||||
| -rw-r--r-- | phpBB/search.php | 6 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index eb301fe6cd..22dbd79b91 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -578,6 +578,7 @@ function bbencode_second_pass_code($text, $uid, $bbcode_tpl) */ function make_clickable($text) { + // pad it with a space so we can match things at the start of the 1st line. $ret = " " . $text; diff --git a/phpBB/search.php b/phpBB/search.php index 788d930765..39125e3310 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -909,7 +909,7 @@ else if( $query_keywords != "" || $query_author != "" || $search_id ) $user_sig = $searchset[$i]['user_sig']; $user_sig_bbcode_uid = $searchset[$i]['user_sig_bbcode_uid']; - $message = make_clickable($message); + if( count($search_string) ) { @@ -941,8 +941,10 @@ else if( $query_keywords != "" || $query_author != "" || $search_id ) 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) ) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 9116812e3c..dabff8a987 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -937,7 +937,6 @@ for($i = 0; $i < $total_posts; $i++) // important, moving things around could break any // output // - $message = make_clickable($message); // // Highlight active words (primarily for search) @@ -985,9 +984,11 @@ for($i = 0; $i < $total_posts; $i++) // 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 // |