aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/search.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-03-19 18:59:50 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-03-19 18:59:50 +0000
commit4ad31e50fc50188c0f0a8a3c4df777a7878d337c (patch)
treef788aaf676bbda0e8b6c43b1a039e160f34d3850 /phpBB/search.php
parent7565b5835887904097be44507d6e8738b6937f63 (diff)
downloadforums-4ad31e50fc50188c0f0a8a3c4df777a7878d337c.tar
forums-4ad31e50fc50188c0f0a8a3c4df777a7878d337c.tar.gz
forums-4ad31e50fc50188c0f0a8a3c4df777a7878d337c.tar.bz2
forums-4ad31e50fc50188c0f0a8a3c4df777a7878d337c.tar.xz
forums-4ad31e50fc50188c0f0a8a3c4df777a7878d337c.zip
Broke bbcode removal when displaying incomplete posts ... fixed
git-svn-id: file:///svn/phpbb/trunk@2355 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/search.php')
-rw-r--r--phpBB/search.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/search.php b/phpBB/search.php
index 725fe62997..40ba6b88bb 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -764,17 +764,15 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
//
if( $return_chars != -1 )
{
- $message = (strlen($message) > $return_chars) ? substr($message, 0, $return_chars) . ' ...' : $message;
$message = strip_tags($message);
- $message = preg_replace('/\[.*?:$bbcode_uid:?.*?\]/si', '', $message);
+ $message = preg_replace("/\[.*?:$bbcode_uid:?.*?\]/si", '', $message);
+ $message = preg_replace('/\[url\]|\[\/url\]/si', '', $message);
+ $message = ( strlen($message) > $return_chars ) ? substr($message, 0, $return_chars) . ' ...' : $message;
if( count($search_string) )
{
$message = preg_replace($search_string, $replace_string, $message);
}
-
- $message = preg_replace('/\[url\]|\[\/url\]/si', '', $message);
-
}
else
{