From 64762ddc20bc950a61f6c10d0ca64f527fb46a6a Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Mon, 7 Jun 2004 13:24:02 +0000
Subject: [PATCH] Don't cache $strforums because the value could change from
 user to user

---
 mod/forum/lib.php | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index cb6d3dcba3..25a35c9eeb 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -478,17 +478,14 @@ function forum_cron () {
 function forum_make_mail_text($course, $forum, $discussion, $post, $userfrom, $userto, $bare = false) {
     global $CFG;
 
-    static $strforums = NULL;
-    if($strforums === NULL) {
-        $strforums = get_string('forums', 'forum');
-    }
-
     $by = New stdClass;
     $by->name = fullname($userfrom, isteacher($course->id, $userto->id));
     $by->date = userdate($post->modified, "", $userto->timezone);
 
     $strbynameondate = get_string('bynameondate', 'forum', $by);
 
+    $strforums = get_string('forums', 'forum');
+
     $canunsubscribe = ! forum_is_forcesubscribed($forum->id);
     $canreply = forum_user_can_post($forum, $userto);
 
@@ -533,13 +530,9 @@ function forum_make_mail_text($course, $forum, $discussion, $post, $userfrom, $u
 function forum_make_mail_html($course, $forum, $discussion, $post, $userfrom, $userto) {
     global $CFG;
 
-    static $strforums = NULL;
-    if($strforums === NULL) {
-        $strforums = get_string('forums', 'forum');
-    }
-
     if ($userto->mailformat == 1) {  // HTML
 
+        $strforums = get_string('forums', 'forum');
         $canreply = forum_user_can_post($forum, $userto);
         $canunsubscribe = ! forum_is_forcesubscribed($forum->id);
 
@@ -561,7 +554,7 @@ function forum_make_mail_html($course, $forum, $discussion, $post, $userfrom, $u
         return $posthtml;
 
     } else {
-      return '';
+        return '';
     }
 }
 
-- 
2.39.5