From c879cb24df266bc3ead8da33c5d52d253eea6217 Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Thu, 5 Nov 2020 17:01:54 +0100
Subject: [PATCH] MDL-70130 core: allow to attach files from localrequestdir to
 emails

Co-authored-by: Paul Holden <paulh@moodle.com>
---
 lib/moodlelib.php            | 3 ++-
 lib/tests/moodlelib_test.php | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 4f543ea91af..4866aaee982 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -6322,7 +6322,8 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml = '',
                 $CFG->dataroot,
                 $CFG->dirroot,
                 $CFG->localcachedir,
-                $CFG->tempdir
+                $CFG->tempdir,
+                $CFG->localrequestdir,
             ]);
             // Set addpath to true.
             $addpath = true;
diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php
index ff52d2c1e18..69621008bfd 100644
--- a/lib/tests/moodlelib_test.php
+++ b/lib/tests/moodlelib_test.php
@@ -3446,6 +3446,9 @@ class core_moodlelib_testcase extends advanced_testcase {
             'dirroot' => [$CFG->dirroot],
             'localcachedir' => [$CFG->localcachedir],
             'tempdir' => [$CFG->tempdir],
+            // Paths within $CFG->localrequestdir.
+            'localrequestdir_request_directory' => [make_request_directory()],
+            'localrequestdir_request_storage_directory' => [get_request_storage_directory()],
             // Pass null to indicate we want to test a path relative to $CFG->dataroot.
             'relative' => [null]
         ];