MDL-14113 digest finished message now in system lang + eliminated one has_capability...

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 6e6aa97ce1d775c441daba1d6c3f6db51a72243d..32ce89e5aff0fe637482861fcb0f1a99f247a1f1 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -634,10 +634,6 @@ function forum_cron() {
                     //override language
                     course_setup($course);
 
-                    $strforums = get_string('forums', 'forum');
-                    $canunsubscribe = ! forum_is_forcesubscribed($forum);
-                    $canreply = forum_user_can_post($forum, $userto, $cm);
-
                     // Fill caches
                     if (!isset($userto->viewfullnames[$forum->id])) {
                         $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
@@ -648,6 +644,10 @@ function forum_cron() {
                         $userto->canpost[$forum->id] = forum_user_can_post($forum, $userto, $cm, $modcontext);
                     }
 
+                    $strforums      = get_string('forums', 'forum');
+                    $canunsubscribe = ! forum_is_forcesubscribed($forum);
+                    $canreply       = $userto->canpost[$forum->id];
+
                     $posttext .= "\n \n";
                     $posttext .= '=====================================================================';
                     $posttext .= "\n \n";
@@ -750,13 +750,13 @@ function forum_cron() {
         set_config('digestmailtimelast', $timenow);
     }
 
+    $USER = $cronuser;
+    course_setup(SITEID); // reset cron user language, theme and timezone settings
+
     if (!empty($usermailcount)) {
         mtrace(get_string('digestsentusers', 'forum', $usermailcount));
     }
 
-    $USER = $cronuser;
-    course_setup(SITEID); // reset cron user language, theme and timezone settings
-
     if (!empty($CFG->forum_lastreadclean)) {
         $timenow = time();
         if ($CFG->forum_lastreadclean + (24*3600) < $timenow) {