Better solution for MDLSITE-152

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index c6dbfb98885efa45a2bca9929e7856b7c8342f94..123fdb246290544c9468a31e1db83c8e775090f3 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -2208,8 +2208,8 @@ function forum_print_post(&$post, $courseid, $ownpost=false, $reply=false, $link
         echo '<td class="topic starter">';
     }
 
-    if (!empty($post->subjectkeeplinks)) {
-        echo '<div class="subject">'.format_string($post->subject, false).'</div>';
+    if (!empty($post->subjectnoformat)) {
+        echo '<div class="subject">'.$post->subject.'</div>';
     } else {
         echo '<div class="subject">'.format_string($post->subject).'</div>';
     }

diff --git a/mod/forum/search.php b/mod/forum/search.php
index 5bd683a9313ed953631d85db1bdd2583903a8939..4c5218736907e40b1bb28a9978258ef2bc3130aa 100644 (file)
--- a/mod/forum/search.php
+++ b/mod/forum/search.php
@@ -201,7 +201,7 @@
         }
 
         $post->subject = $fullsubject;
-        $post->subjectkeeplinks = true;
+        $post->subjectnoformat = 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