mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 16:04:25 +02:00
Code Issues Projects Releases Wiki Activity

Merged fix for MDL-6615.

Browse Source
This commit is contained in:
vyshane 2006-09-24 15:28:16 +00:00
parent d3b93bd26a
commit b343df8690
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mod/forum/search.php
View File

@ -199,6 +199,17 @@
//Use highlight() with nonsense tags to spot search terms in the
//actual text content first. fiedorow - 9/2/2005
$missing_terms = "";
// Hack for posts of format FORMAT_PLAIN. Otherwise html tags added by
// the highlight() call bellow get stripped out by forum_print_post().
if ($post->format == FORMAT_PLAIN) {
$post->message = s($post->message);
$post->message = rebuildnolinktag($post->message);
$post->message = str_replace(' ', '  ', $post->message);
$post->message = nl2br($post->message);
$post->format = FORMAT_HTML;
}
$options = new object();
$options->trusttext = true;
// detect TRUSTTEXT marker before first call to format_text
@ -207,8 +218,9 @@
} else {
$ttpresent = false;
}
$message = highlight($strippedsearch,format_text($post->message, $post->format, $options, $course->id),
0,'<fgw9sdpq4>','</fgw9sdpq4>');
$message = highlight($strippedsearch,
format_text($post->message, $post->format, $options, $course->id),
0, '<fgw9sdpq4>', '</fgw9sdpq4>');
foreach ($searchterms as $searchterm) {
if (preg_match("/$searchterm/i",$message) && !preg_match('/<fgw9sdpq4>'.$searchterm.'<\/fgw9sdpq4>/i',$message)) {