From 776503b29abfead6cee1c833f7fbfc352e975de7 Mon Sep 17 00:00:00 2001
From: David Monllao <davidm@moodle.com>
Date: Fri, 11 May 2018 20:15:27 +0200
Subject: [PATCH] MDL-62029 core_course: Site format is not a standard plugin

---
 course/classes/privacy/provider.php | 3 ++-
 course/tests/privacy_test.php       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/course/classes/privacy/provider.php b/course/classes/privacy/provider.php
index e4d30b65ef6..f18eea4733d 100644
--- a/course/classes/privacy/provider.php
+++ b/course/classes/privacy/provider.php
@@ -158,13 +158,14 @@ class provider implements
 
         foreach ($coursedata as $course) {
             $context = \context_course::instance($course->id);
+            $courseformat = $course->format !== 'site' ? get_string('pluginname', 'format_' . $course->format) : get_string('site');
             $data = (object) [
                 'fullname' => $course->fullname,
                 'shortname' => $course->shortname,
                 'idnumber' => $course->idnumber,
                 'summary' => writer::with_context($context)->rewrite_pluginfile_urls([], 'course', 'summary', 0,
                                                                                      format_string($course->summary)),
-                'format' => get_string('pluginname', 'format_' . $course->format),
+                'format' => $courseformat,
                 'startdate' => transform::datetime($course->startdate),
                 'enddate' => transform::datetime($course->enddate)
             ];
diff --git a/course/tests/privacy_test.php b/course/tests/privacy_test.php
index b2d903363f0..3f4eceedbe8 100644
--- a/course/tests/privacy_test.php
+++ b/course/tests/privacy_test.php
@@ -105,7 +105,7 @@ class core_course_privacy_testcase extends \core_privacy\tests\provider_testcase
         $this->resetAfterTest();
 
         // Create a course and a single module.
-        $course1 = $this->getDataGenerator()->create_course(['fullname' => 'Course 1', 'shortname' => 'C1']);
+        $course1 = $this->getDataGenerator()->create_course(['fullname' => 'Course 1', 'shortname' => 'C1', 'format' => 'site']);
         $context1 = context_course::instance($course1->id);
         $modassign = $this->getDataGenerator()->create_module('assign', ['course' => $course1->id, 'name' => 'assign test 1']);
         $assigncontext = context_module::instance($modassign->cmid);