mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Broke bbcode removal when displaying incomplete posts ... fixed
git-svn-id: file:///svn/phpbb/trunk@2355 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
7565b58358
commit
4ad31e50fc
1 changed files with 3 additions and 5 deletions
|
@ -764,17 +764,15 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
|
||||||
//
|
//
|
||||||
if( $return_chars != -1 )
|
if( $return_chars != -1 )
|
||||||
{
|
{
|
||||||
$message = (strlen($message) > $return_chars) ? substr($message, 0, $return_chars) . ' ...' : $message;
|
|
||||||
$message = strip_tags($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) )
|
if( count($search_string) )
|
||||||
{
|
{
|
||||||
$message = preg_replace($search_string, $replace_string, $message);
|
$message = preg_replace($search_string, $replace_string, $message);
|
||||||
}
|
}
|
||||||
|
|
||||||
$message = preg_replace('/\[url\]|\[\/url\]/si', '', $message);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue