Merge branch 'MDL-61751-master-fix' of https://github.com/snake/moodle

safatshahin · Apr 4, 2018 · b9201e1 · b9201e1
2 parents 711c477 + 0fe2692
commit b9201e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/plagiarism/classes/privacy/plagiarism_provider.php b/plagiarism/classes/privacy/plagiarism_provider.php
@@ -34,10 +34,7 @@
  */
 interface plagiarism_provider extends
         // The plagiarism_provider should be implemented by plugins which only provide information to a subsystem.
-        \core_privacy\local\request\plugin\subsystem_provider,
-
-        // All plagiarism plugins should also implement the metadata provider.
-        \core_privacy\local\metadata\provider {
+        \core_privacy\local\request\plugin\subsystem_provider {
 
     /**
      * Export all plagiarism data from each plagiarism plugin for the specified userid and context.

diff --git a/plagiarism/tests/privacy_legacy_polyfill_test.php b/plagiarism/tests/privacy_legacy_polyfill_test.php
@@ -94,9 +94,12 @@ public function test_delete_plagiarism_for_user() {
  * @copyright   2018 Jake Dallimore <jrhdallimore@gmail.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class test_legacy_polyfill_plagiarism_provider implements \core_plagiarism\privacy\plagiarism_provider {
+class test_legacy_polyfill_plagiarism_provider implements
+        \core_privacy\local\metadata\provider,
+        \core_plagiarism\privacy\plagiarism_provider {
 
     use \core_plagiarism\privacy\legacy_polyfill;
+    use \core_privacy\local\legacy_polyfill;
 
     /**
      * @var test_legacy_polyfill_plagiarism_provider $mock.