diff options
| author | James Atkinson <thefinn@users.sourceforge.net> | 2001-09-10 23:07:57 +0000 |
|---|---|---|
| committer | James Atkinson <thefinn@users.sourceforge.net> | 2001-09-10 23:07:57 +0000 |
| commit | ff898dab577df54831adba814207c2d5de0207be (patch) | |
| tree | 5efd92621d58ec46e3b9d6cf18e1bca89c234d53 | |
| parent | 09ae82cd775b94cca794f08306c7e44cc1b8aed0 (diff) | |
| download | forums-ff898dab577df54831adba814207c2d5de0207be.tar forums-ff898dab577df54831adba814207c2d5de0207be.tar.gz forums-ff898dab577df54831adba814207c2d5de0207be.tar.bz2 forums-ff898dab577df54831adba814207c2d5de0207be.tar.xz forums-ff898dab577df54831adba814207c2d5de0207be.zip | |
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
| -rw-r--r-- | phpBB/viewtopic.php | 6 |
1 files 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 .= "<br /><br />_________________<br />" . $user_sig; + $message .= "<br /><br />_________________<br />" . 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']) { |