diff --git a/CHANGES.md b/CHANGES.md
index 1c402d8089c4bac4e2e111dd02be307c2ae016f0..b41e08d4ee73bc46771a1e0d71824596717a7661 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,8 @@ Changes
### Unreleased
+* 2020-09-02 - Deleted own additional edit button for courses because upstream Boost reimplemented it.
+ Many thanks to @christianwolters for providing this fix.
* 2020-09-02 - Prepare compatibility for Moodle 3.9.
### Release v3.8-r5
diff --git a/README.md b/README.md
index 65ae853a4a70f2271b661e25d51438b237141523..f24b5cece31d563af2f536ad58d75bbc8c186533 100644
--- a/README.md
+++ b/README.md
@@ -121,10 +121,6 @@ With this setting you can manage where the "Add a block" widget should be displa
This setting can change the behaviour Moodle displays the title for the first course section. Moodle does not display it as long as the default title for this section is set. As soon as a user changes the title, it will appear. With this setting (option is checked), you can achieve a consistent behaviour by always showing the title for section 0.
-#### Course edit button
-
-With this setting you can add an additional course edit on / off button to the course header for faster accessibility. This the same way as it was displayed before theme_boost.
-
#### Course related hints
##### Position of switch role information
diff --git a/classes/output/core_renderer.php b/classes/output/core_renderer.php
index 63a3575b070a366168bad125f040348890cdf072..7eb3f69468ec80df60f22c965cdb25f121772ec9 100644
--- a/classes/output/core_renderer.php
+++ b/classes/output/core_renderer.php
@@ -60,28 +60,6 @@ defined('MOODLE_INTERNAL') || die;
*/
class core_renderer extends \core_renderer {
- /**
- * Override to display an edit button again by calling the parent function
- * in core/core_renderer because theme_boost's function returns an empty
- * string and therefore displays nothing.
- *
- * MODIFICATION: This renderer function is copied and modified from /theme/boost/classes/output/core_renderer.php
- *
- * @param moodle_url $url The current course url.
- * @return \core_renderer::edit_button Moodle edit button.
- */
- public function edit_button(moodle_url $url) {
- // MODIFICATION START.
- // If setting editbuttonincourseheader ist checked give out the edit on / off button in course header.
- if (get_config('theme_boost_campus', 'courseeditbutton') == '1') {
- return \core_renderer::edit_button($url);
- }
- // MODIFICATION END.
- /* ORIGINAL START.
- return '';
- ORIGINAL END. */
- }
-
/**
* Override to add additional class for the random login image to the body.
*
diff --git a/db/upgrade.php b/db/upgrade.php
index 2c37566735e52f625d3d015f4de01badde26cf68..450c69245858c7c51773eb2dbeae7bf8f4a3779d 100644
--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -73,5 +73,14 @@ function xmldb_theme_boost_campus_upgrade($oldversion) {
upgrade_plugin_savepoint(true, 2020030800, 'theme', 'boost_campus');
}
+ if ($oldversion < 2020082801) {
+ // The setting "theme_boost_campus|courseeditbutton" has been removed because the setting was
+ // reimplemented in Boost core.
+ // Therefore we remove this setting in the database.
+ set_config('courseeditbutton', null, 'theme_boost_campus');
+
+ upgrade_plugin_savepoint(true, 2020082801, 'theme', 'boost_campus');
+ }
+
return true;
}
diff --git a/lang/en/theme_boost_campus.php b/lang/en/theme_boost_campus.php
index bec69e9ef431f56b10dda19d6eec26a53fd32e83..fc33a89afb2ca1f56b2f817362a178fc537c53f9 100644
--- a/lang/en/theme_boost_campus.php
+++ b/lang/en/theme_boost_campus.php
@@ -67,9 +67,6 @@ $string['courselayoutsettings'] = 'Course Layout Settings';
// ...Section 0.
$string['section0titlesetting'] = 'Section 0: Title';
$string['section0titlesetting_desc'] = 'This setting can change the behaviour Moodle displays the title for the first course section. Moodle does not display it as long as the default title for this section is set. As soon as a user changes the title, it will appear. With this setting (option is checked), you can achieve a consistent behaviour by always showing the title for section 0.';
-// ...Course edit button.
-$string['courseeditbuttonsetting'] = 'Course edit button';
-$string['courseeditbuttonsetting_desc'] = 'With this setting you can add an additional course edit on / off button to the course header for faster accessibility of this often used function.';
// ...Course related hints.
$string['coursehintsheadingsetting'] = 'Course related hints.';
// ...Switch role information.
diff --git a/settings.php b/settings.php
index 0ced88dffb3d2e3e0d48fb3ef6f9c6f7424b1e9b..7702db9adb91200ecae623bb38c953159a8b1b88 100644
--- a/settings.php
+++ b/settings.php
@@ -245,13 +245,6 @@ if ($ADMIN->fulltree) {
$setting->set_updatedcallback('theme_reset_all_caches');
$page->add($setting);
- // Setting for displaying edit on / off button addionally in course header.
- $name = 'theme_boost_campus/courseeditbutton';
- $title = get_string('courseeditbuttonsetting', 'theme_boost_campus', null, true);
- $description = get_string('courseeditbuttonsetting_desc', 'theme_boost_campus', null, true);
- $setting = new admin_setting_configcheckbox($name, $title, $description, 0);
- $page->add($setting);
-
// Settings title for grouping course settings related aspects together. We don't need a description here.
$name = 'theme_boost_campus/coursehintsheading';
$title = get_string('coursehintsheadingsetting', 'theme_boost_campus', null, true);
diff --git a/tests/behat/theme_boost_campus_course_layout_settings.feature b/tests/behat/theme_boost_campus_course_layout_settings.feature
index 53a64693f9b50925b56c39668267d3392e7dbad7..dd38653e49db8353ada4fa3d743e1e0c9847fa14 100644
--- a/tests/behat/theme_boost_campus_course_layout_settings.feature
+++ b/tests/behat/theme_boost_campus_course_layout_settings.feature
@@ -42,17 +42,6 @@ Feature: Configuring the theme_boost_campus plugin for the "Course Layout settin
| New value for Section name | This is the general section |
Then I should see "This is the general section" in the "li#section-0" "css_element"
- Scenario: Enable "Course edit button"
- Given the following config values are set as admin:
- | config | value | plugin |
- | courseeditbutton | 1 | theme_boost_campus |
- When I log in as "teacher1"
- And I am on "Course 1" course homepage
- Then I should see "Turn editing on" in the "#page-header .singlebutton" "css_element"
- When I click on "Turn editing on" "button"
- Then I should see "Turn editing off" in the "#page-header .singlebutton" "css_element"
- And I should see "Add an activity or resource"
-
Scenario: Enable "Position of switch role information"
Given the following config values are set as admin:
| config | value | plugin |
diff --git a/version.php b/version.php
index 694ebea8edb57b4a98f7df1ac51732a124688ffa..3a25beed899005a204c0c45d3345631004abbdfe 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->component = 'theme_boost_campus';
-$plugin->version = 2020090100;
+$plugin->version = 2020090101;
$plugin->release = 'v3.8-r5';
$plugin->requires = 2020061500;
$plugin->maturity = MATURITY_STABLE;