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 8a762d29c2eff8b56c5b4865e7d5140171e6a336..84704423d047e226b6c4df8df3981e58fc47280e 100644 (file)
--- 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 1d3515412e9b70dab0313c0e7211ebc8d09c1f15..74c3c57b904230f22ad2ff105ed975f56964ebd0 100644 (file)
--- 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) ) {