moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 03:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-61971-master' of git://github.com/mickhawkins/moodle

Browse source
This commit is contained in:
Jake Dallimore 2018-05-10 16:23:22 +08:00
commit eac66ff63c
5 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
admin/tool/dataprivacy/classes/output/data_requests_page.php
View file

@ -73,6 +73,11 @@ class data_requests_page implements renderable, templatable {
$data->newdatarequesturl = new moodle_url('/admin/tool/dataprivacy/createdatarequest.php');
$data->newdatarequesturl->param('manage', true);
if (!is_https()) {
$httpwarningmessage = get_string('httpwarning', 'tool_dataprivacy');
$data->httpsite = array('message' => $httpwarningmessage, 'announce' => 1);
}
$requests = [];
foreach ($this->requests as $request) {
$requestid = $request->get('id');

5
admin/tool/dataprivacy/classes/output/my_data_requests_page.php
View file

@ -70,6 +70,11 @@ class my_data_requests_page implements renderable, templatable {
$data = new stdClass();
$data->newdatarequesturl = new moodle_url('/admin/tool/dataprivacy/createdatarequest.php');
if (!is_https()) {
$httpwarningmessage = get_string('httpwarning', 'tool_dataprivacy');
$data->httpsite = array('message' => $httpwarningmessage, 'announce' => 1);
}
$requests = [];
foreach ($this->requests as $request) {
$requestid = $request->get('id');