diff --git a/admin/environment.xml b/admin/environment.xml
index 55a1aee8825..13c205a665e 100644
--- a/admin/environment.xml
+++ b/admin/environment.xml
@@ -3729,6 +3729,8 @@
+
+
diff --git a/admin/index.php b/admin/index.php
index 943fea85259..c8c9015d188 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -916,6 +916,12 @@ $showfeedbackencouragement = empty($CFG->enableuserfeedback);
// Check if the service and support content setting is enabled or not.
$servicesandsupportcontent = !isset($CFG->showservicesandsupportcontent) || $CFG->showservicesandsupportcontent;
+// Check whether the XML-RPC protocol is enabled or not.
+require_once($CFG->libdir . '/environmentlib.php');
+$result = new environment_results('custom_checks');
+$result = check_xmlrpc_usage($result);
+$xmlrpcwarning = !is_null($result) ? get_string($result->getFeedbackStr(), 'admin') : '';
+
admin_externalpage_setup('adminnotifications');
$output = $PAGE->get_renderer('core', 'admin');
@@ -924,4 +930,5 @@ echo $output->admin_notifications_page($maturity, $insecuredataroot, $errorsdisp
$maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb,
$registered, $cachewarnings, $eventshandlers, $themedesignermode, $devlibdir,
$mobileconfigured, $overridetossl, $invalidforgottenpasswordurl, $croninfrequent,
- $showcampaigncontent, $showfeedbackencouragement, $servicesandsupportcontent);
+ $showcampaigncontent, $showfeedbackencouragement, $servicesandsupportcontent,
+ $xmlrpcwarning);
diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index a1223012b77..edb3b06d322 100644
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -117,6 +117,7 @@ if ($form = data_submitted() and confirm_sesskey()) {
}
echo $OUTPUT->header();
+echo $OUTPUT->render(mnet_get_deprecation_notice());
// Explain
echo $OUTPUT->box(get_string('ssoacldescr','mnet'));
diff --git a/admin/mnet/index.php b/admin/mnet/index.php
index fff93869420..5e0240b8582 100644
--- a/admin/mnet/index.php
+++ b/admin/mnet/index.php
@@ -81,6 +81,7 @@
$hosts = $DB->get_records_select('mnet_host', "id <> ? AND deleted = 0", array($CFG->mnet_localhost_id), 'wwwroot ASC');
echo $OUTPUT->header();
+ echo $OUTPUT->render(mnet_get_deprecation_notice());
?>