From ff898dab577df54831adba814207c2d5de0207be Mon Sep 17 00:00:00 2001 From: James Atkinson Date: Mon, 10 Sep 2001 23:07:57 +0000 Subject: [PATCH] Fixed little bug with auto-linking screwing up links when both at the end of a message and the signature is attached. This fix works, but dosan't really solve the problem because I have no idea why it was happening in the first place git-svn-id: file:///svn/phpbb/trunk@1026 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/viewtopic.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index fea2c0842a..666d129a27 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -770,9 +770,11 @@ for($i = 0; $i < $total_posts; $i++) $message = preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message); } + $message = make_clickable($message); + if( $postrow[$i]['enable_sig'] ) { - $message .= "

_________________
" . $user_sig; + $message .= "

_________________
" . make_clickable($user_sig); } if( count($orig_word) ) @@ -781,7 +783,7 @@ for($i = 0; $i < $total_posts; $i++) $message = preg_replace($orig_word, $replacement_word, $message); } - $message = make_clickable($message); + if($board_config['allow_smilies'] && $postrow[$i]['enable_smilies']) {