MDL-64506 theme_bootstrapbase: Remove bootstrapbase from core

.gitattributes

@@ -1,5 +1,3 @@
 **/yui/build/** -diff
 **/amd/build/** -diff
 lib/dml/oci_native_moodle_package.sql text eol=lf
-theme/bootstrapbase/style/editor.css -diff
-theme/bootstrapbase/style/moodle.css -diff

admin/settings/appearance.php

@@ -25,7 +25,6 @@
     $temp->add(new admin_setting_configcheckbox('allowcohortthemes',  new lang_string('allowcohortthemes', 'admin'), new lang_string('configallowcohortthemes', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('allowthemechangeonurl',  new lang_string('allowthemechangeonurl', 'admin'), new lang_string('configallowthemechangeonurl', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('allowuserblockhiding', new lang_string('allowuserblockhiding', 'admin'), new lang_string('configallowuserblockhiding', 'admin'), 1));
-    $temp->add(new admin_setting_configcheckbox('allowblockstodock', new lang_string('allowblockstodock', 'admin'), new lang_string('configallowblockstodock', 'admin'), 1));
     $temp->add(new admin_setting_configtextarea('custommenuitems', new lang_string('custommenuitems', 'admin'),
         new lang_string('configcustommenuitems', 'admin'), '', PARAM_RAW, '50', '10'));
     $temp->add(new admin_setting_configtextarea(

admin/upgrade.txt

@@ -1,5 +1,11 @@
 This files describes API changes in /admin/*.
 
+=== 3.7 ===
+
+* Admin setting "Allow blocks to use the dock" (allowblockstodock) has been removed & stings deprecated.
+  Docking of blocks is no longer supported within the core themes (Boost, Classic).
+  Please see MDL-64506 for further details.
+
 === 3.3 ===
 
 * The admin settings admin_setting_configselect and admin_setting_configmultiselect now support the optgroup tag.

blocks/moodleblock.class.php

@@ -653,8 +653,7 @@ static function get_extra_capabilities() {
      * @return bool
      */
     public function instance_can_be_docked() {
-        global $CFG;
-        return (!empty($CFG->allowblockstodock) && $this->page->theme->enable_dock);
+        return false;
     }
 
     /**

blocks/tests/behat/behat_blocks.php

@@ -70,21 +70,6 @@ public function i_add_the_block_if_not_present($blockname) {
         }
     }
 
-    /**
-     * Docks a block. Editing mode should be previously enabled.
-     *
-     * @Given /^I dock "(?P<block_name_string>(?:[^"]|\\")*)" block$/
-     * @param string $blockname
-     */
-    public function i_dock_block($blockname) {
-
-        // Looking for both title and alt.
-        $xpath = "//input[@type='image'][@title='" . get_string('dockblock', 'block', $blockname) . "' or @alt='" . get_string('addtodock', 'block') . "']";
-        $this->execute('behat_general::i_click_on_in_the',
-            array($xpath, "xpath_element", $this->escape($blockname), "block")
-        );
-    }
-
     /**
      * Opens a block's actions menu if it is not already opened.
      *