From b61639598f62ccd050032ca8b5aee4f5b5cd8f2d Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Mon, 6 May 2019 16:13:15 +0800
Subject: [PATCH] MDL-65505 forum: handle deleted users with no context in
 render

---
 mod/forum/classes/local/exporters/author.php         |  6 +++---
 .../classes/local/exporters/discussion_summary.php   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mod/forum/classes/local/exporters/author.php b/mod/forum/classes/local/exporters/author.php
index 203fc82a350..7ac48221d2c 100644
--- a/mod/forum/classes/local/exporters/author.php
+++ b/mod/forum/classes/local/exporters/author.php
@@ -42,7 +42,7 @@ require_once($CFG->dirroot . '/mod/forum/lib.php');
 class author extends exporter {
     /** @var author_entity $author Author entity */
     private $author;
-    /** @var int $authorcontextid The context id for the author entity */
+    /** @var int|null $authorcontextid The context id for the author entity */
     private $authorcontextid;
     /** @var array $authorgroups List of groups that the author belongs to */
     private $authorgroups;
@@ -53,14 +53,14 @@ class author extends exporter {
      * Constructor.
      *
      * @param author_entity $author The author entity to export
-     * @param int $authorcontextid The context id for the author entity to export
+     * @param int|null $authorcontextid The context id for the author entity to export (null if the user doesn't have one)
      * @param stdClass[] $authorgroups The list of groups that the author belongs to
      * @param bool $canview Can the requesting user view this author or should it be anonymised?
      * @param array $related The related data for the export.
      */
     public function __construct(
         author_entity $author,
-        int $authorcontextid,
+        ?int $authorcontextid,
         array $authorgroups = [],
         bool $canview = true,
         array $related = []
diff --git a/mod/forum/classes/local/exporters/discussion_summary.php b/mod/forum/classes/local/exporters/discussion_summary.php
index 3d009ee222d..d50b11241f6 100644
--- a/mod/forum/classes/local/exporters/discussion_summary.php
+++ b/mod/forum/classes/local/exporters/discussion_summary.php
@@ -55,10 +55,10 @@ class discussion_summary extends exporter {
     /** @var int The latest post id in the discussion */
     private $latestpostid;
 
-    /** @var int The context id for the author of the first post */
+    /** @var int|null The context id for the author of the first post */
     private $firstpostauthorcontextid;
 
-    /** @var int The context id for the author of the latest post */
+    /** @var int|null The context id for the author of the latest post */
     private $latestpostauthorcontextid;
 
     /**
@@ -70,8 +70,8 @@ class discussion_summary extends exporter {
      * @param int $replycount The number of replies to the discussion
      * @param int $unreadcount number of unread posts if the user is tracking these
      * @param int $latestpostid The latest post id in the discussion
-     * @param int $firstpostauthorcontextid The context id for the author of the first post
-     * @param int $latestpostauthorcontextid The context id for the author of the latest post
+     * @param int|null $firstpostauthorcontextid The context id for the author of the first post
+     * @param int|null $latestpostauthorcontextid The context id for the author of the latest post
      * @param array $related The related objects
      */
     public function __construct(
@@ -81,8 +81,8 @@ class discussion_summary extends exporter {
         int $replycount,
         int $unreadcount,
         int $latestpostid,
-        int $firstpostauthorcontextid,
-        int $latestpostauthorcontextid,
+        ?int $firstpostauthorcontextid,
+        ?int $latestpostauthorcontextid,
         array $related = []
     ) {
         $this->summary = $summary;