Merge branch 'MDL-62270-MASTER-Cron-task-fails-on-data-privacy-related-task' of https...
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 Jun 2018 01:32:59 +0000 (09:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 Jun 2018 01:32:59 +0000 (09:32 +0800)
admin/tool/dataprivacy/classes/task/initiate_data_request_task.php
admin/tool/dataprivacy/classes/task/process_data_request_task.php

index 2ee4a0a..70402f4 100644 (file)
@@ -54,7 +54,7 @@ class initiate_data_request_task extends adhoc_task {
     public function execute() {
         global $CFG;
 
-        require_once($CFG->dirroot . '/admin/tool/dataprivacy/lib.php');
+        require_once($CFG->dirroot . "/{$CFG->admin}/tool/dataprivacy/lib.php");
 
         if (!isset($this->get_custom_data()->requestid)) {
             throw new coding_exception('The custom data \'requestid\' is required.');
index 6a93217..c58f574 100644 (file)
@@ -57,7 +57,7 @@ class process_data_request_task extends adhoc_task {
     public function execute() {
         global $CFG, $PAGE, $SITE;
 
-        require_once($CFG->dirroot . '/admin/tool/dataprivacy/lib.php');
+        require_once($CFG->dirroot . "/{$CFG->admin}/tool/dataprivacy/lib.php");
 
         if (!isset($this->get_custom_data()->requestid)) {
             throw new coding_exception('The custom data \'requestid\' is required.');