Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index a6f8a30..7696f07 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -8498,8 +8498,6 @@ function forum_set_user_maildigest($forum, $maildigest, $user = null) {
             $subscription->id = $DB->insert_record('forum_digests', $subscription);
         }
     }
-
-    return true;
 }
 
 /**

diff --git a/mod/forum/maildigest.php b/mod/forum/maildigest.php
index 6078398..ae8d72d 100644 (file)
--- a/mod/forum/maildigest.php
+++ b/mod/forum/maildigest.php
@@ -52,7 +52,8 @@ $digestoptions = forum_get_user_digest_options();
 $info = new stdClass();
 $info->name  = fullname($USER);
 $info->forum = format_string($forum->name);
-$info->maildigest = forum_set_user_maildigest($forum, $maildigest);
+forum_set_user_maildigest($forum, $maildigest);
+$info->maildigest = $maildigest;
 
 if ($maildigest === -1) {
     // Get the default maildigest options.