Merged from stable - Only break up subject lines for recent activity bug 1995

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 1c1dd153a9ebc0a240109e74bb2f5e6bb5ef222b..0b7a8cab86cbe525793e1a415461baf7ff4a5f45 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -722,6 +722,7 @@ function forum_print_recent_activity($course, $isteacher, $timestart) {
                 $fullname = fullname($post, $isteacher);
                 echo "<p $teacheronly><font size=\"1\">$date - $fullname<br />";
                 echo "\"<a href=\"$CFG->wwwroot/mod/forum/$log->url\">";
+                $post->subject = break_up_long_words($post->subject);
                 if (!empty($CFG->filterall)) {
                     $post->subject = filter_text("<nolink>$post->subject</nolink>", $course->id);
                 }

diff --git a/mod/forum/post.php b/mod/forum/post.php
index eaba012a29fa162fd1ad020582f34e94baa6f3d5..44915eaf225dc40ea3256aa07292a9c1fb5817c4 100644 (file)
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -28,7 +28,6 @@
         }
 
         $post->subject = strip_tags($post->subject, '<lang>');        // Strip all tags except lang
-        $post->subject = break_up_long_words($post->subject);
 
         //$post->message = clean_text($post->message, $post->format);   // Clean up any bad tags