Merge branch 'MDL-77630-400' of https://github.com/meirzamoodle/moodle into MOODLE_400_STABLE

mod/forum/classes/local/entities/forum.php

@@ -99,8 +99,8 @@ class forum {
     private $completionreplies;
     /** @var int $completionposts Completion posts */
     private $completionposts;
-    /** @var bool $displaywordcounts Should display word counts in posts */
-    private $displaywordcounts;
+    /** @var bool $displaywordcount Should display word counts in posts */
+    private $displaywordcount;
     /** @var bool $lockdiscussionafter Timestamp after which discussions should be locked */
     private $lockdiscussionafter;
     /** @var int $duedate Timestamp that represents the due date for forum posts */

mod/forum/classes/task/cron_task.php

@@ -221,7 +221,7 @@ class cron_task extends \core\task\scheduled_task {
         global $DB;
 
         if (empty($discussionids)) {
-            $this->discussion = [];
+            $this->discussions = [];
         } else {
 
             $requiredfields = [