From: skodak Date: Mon, 14 Apr 2008 17:12:25 +0000 (+0000) Subject: MDL-14113 digest finished message now in system lang + eliminated one has_capability... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=de85c32062606ec3d68771ac5cf4f9d2a72e5f16;p=moodle.git MDL-14113 digest finished message now in system lang + eliminated one has_capability call; merged from MOODLE_19_STABLE --- diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 6e6aa97ce1..32ce89e5af 100644 --- 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) {