From: moodler <moodler>
Date: Mon, 3 Sep 2007 07:55:28 +0000 (+0000)
Subject: FIx the links that were removed by format_string in 1.8   MDLSITE-152
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=acc7a2fabe933d62e8d3dae239b6e10cbc4e6a6b;p=moodle.git

FIx the links that were removed by format_string in 1.8   MDLSITE-152
---

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 8da6ce8025..c6dbfb9888 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -2208,7 +2208,11 @@ function forum_print_post(&$post, $courseid, $ownpost=false, $reply=false, $link
         echo '<td class="topic starter">';
     }
 
-    echo '<div class="subject">'.format_string($post->subject).'</div>';
+    if (!empty($post->subjectkeeplinks)) {
+        echo '<div class="subject">'.format_string($post->subject, false).'</div>';
+    } else {
+        echo '<div class="subject">'.format_string($post->subject).'</div>';
+    }
 
     echo '<div class="author">';
     $fullname = fullname($post, has_capability('moodle/site:viewfullnames', $modcontext));
diff --git a/mod/forum/search.php b/mod/forum/search.php
index 7593d4c817..5bd683a931 100644
--- a/mod/forum/search.php
+++ b/mod/forum/search.php
@@ -201,6 +201,7 @@
         }
 
         $post->subject = $fullsubject;
+        $post->subjectkeeplinks = true;
 
         // Identify search terms only found in HTML markup, and add a warning about them to
         // the start of the message text. However, do not do the highlighting here. forum_print_post