From: moodler <moodler>
Date: Tue, 18 May 2004 03:14:01 +0000 (+0000)
Subject: Minor tweaks I forgot to check in from a long time ago
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d31262021a2477a68fbdcb8177c8b6d7860dfe49;p=moodle.git

Minor tweaks I forgot to check in from a long time ago
---

diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php
index 8a762d29c2..84704423d0 100644
--- a/mod/forum/subscribe.php
+++ b/mod/forum/subscribe.php
@@ -70,7 +70,7 @@
         redirect($returnto, get_string("everyoneissubscribed", "forum"), 1);
     }
 
-    $info->name  = "$user->firstname $user->lastname";
+    $info->name  = fullname($user);
     $info->forum = $forum->name;
 
     if ( forum_is_subscribed($user->id, $forum->id) ) {
diff --git a/mod/forum/subscribers.php b/mod/forum/subscribers.php
index 1d3515412e..74c3c57b90 100644
--- a/mod/forum/subscribers.php
+++ b/mod/forum/subscribers.php
@@ -79,7 +79,12 @@
     }
 
     if ($unsubscribe) {
-        forum_unsubscribe($unsubscribe, $forum->id);
+        if ($user = get_record('user', 'id', $unsubscribe)) {
+            forum_unsubscribe($user->id, $forum->id);
+            $info->name  = fullname($user);
+            $info->forum = $forum->name;
+            notify(get_string("nownotsubscribed", "forum", $info));
+        }
     }
 
     if (! $users = forum_subscribed_users($course, $forum, $currentgroup) ) {