MDL-70130 core: allow to attach files from localrequestdir to emails

Co-authored-by: Paul Holden <paulh@moodle.com>
moodle · Nov 6, 2020 · e30716a · e30716a
1 parent 8a9a4ee
commit e30716a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -6325,7 +6325,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
@@ -3446,6 +3446,9 @@ public function email_to_user_attachment_provider(): array {
             '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]
         ];