From 89eded84775c90775db1471570becaa24d034929 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Thu, 21 Mar 2019 00:13:27 +0100
Subject: [PATCH] MDL-63263 tool_recyclebin: show the note as part of the
 heading element

It looks better (IMO) than using admin_setting_description and works in all
branches.
---
 admin/settings/courses.php | 6 +-----
 lang/en/backup.php         | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/admin/settings/courses.php b/admin/settings/courses.php
index d080c6e2e98..a6a9bfeccbf 100644
--- a/admin/settings/courses.php
+++ b/admin/settings/courses.php
@@ -325,11 +325,7 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_skip_modif_prev', new lang_string('skipmodifprev', 'backup'), new lang_string('skipmodifprevhelp', 'backup'), 0));
 
     // Automated defaults section.
-    $temp->add(new admin_setting_heading('automatedsettings', new lang_string('automatedsettings','backup'), ''));
-    $temp->add(new admin_setting_description('recyclebin',
-        new lang_string('recyclebin', 'backup'),
-        new lang_string('recyclebin_desc', 'backup')
-    ));
+    $temp->add(new admin_setting_heading('automatedsettings', new lang_string('automatedsettings','backup'), new lang_string('recyclebin_desc', 'backup')));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_users', new lang_string('generalusers', 'backup'), new lang_string('configgeneralusers', 'backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_role_assignments', new lang_string('generalroleassignments','backup'), new lang_string('configgeneralroleassignments','backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities','backup'), new lang_string('configgeneralactivities','backup'), 1));
diff --git a/lang/en/backup.php b/lang/en/backup.php
index d5511c085bc..e3b292aba18 100644
--- a/lang/en/backup.php
+++ b/lang/en/backup.php
@@ -331,5 +331,4 @@ $string['unnamedsection'] = 'Unnamed section';
 $string['userinfo'] = 'Userinfo';
 $string['module'] = 'Module';
 $string['morecoursesearchresults'] = 'More than {$a} courses found, showing first {$a} results';
-$string['recyclebin'] = 'Recycle bin';
 $string['recyclebin_desc'] = 'These settings will be also applied to recycle bin';