diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 90c18f5..a42d799 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1474,6 +1474,9 @@ function theme_enable($theme_list, $enable_dependencies = TRUE) { $theme_list = array_keys($theme_list); } + // Required for schema version checks and constants. + include_once DRUPAL_ROOT . '/core/includes/install.inc'; + $themes_installed = array(); $themes_enabled = array(); foreach ($theme_list as $key) { diff --git a/core/modules/block/block.module b/core/modules/block/block.module index b676169..0412c75 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -150,8 +150,8 @@ function block_menu() { 'file' => 'block.admin.inc', ); - $items['admin/structure/block/list/list'] = array( - 'title' => 'List', + $items['admin/structure/block/list/default'] = array( + 'title' => 'Default theme blocks', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); @@ -200,12 +200,12 @@ function block_menu_local_tasks_alter(&$data, $router_item, $root_path) { $themes = list_themes(); $default_theme = variable_get('theme_default', 'stark'); foreach ($data['tabs'][0] as &$tab) { - if (isset($tab['#link']['path']) && $tab['#link']['path'] == 'admin/structure/block/list/list') { + if (isset($tab['#link']['path']) && $tab['#link']['path'] == 'admin/structure/block/list/default') { $tab['#link']['title'] = $themes[$default_theme]->info['name']; } } - // "Expand" the dynamic %theme argument into a tab for each theme. + // Expand the dynamic %theme argument into a tab for each theme. $selected_theme = isset($router_item['original_map'][4]) ? $router_item['original_map'][4] : NULL; foreach ($themes as $theme) { // The default theme is always exposed as default local task already. diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockAdminThemeTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockAdminThemeTest.php index e80a053..ddee5dc 100644 --- a/core/modules/block/lib/Drupal/block/Tests/BlockAdminThemeTest.php +++ b/core/modules/block/lib/Drupal/block/Tests/BlockAdminThemeTest.php @@ -37,7 +37,7 @@ function testAdminTheme() { $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer themes')); $this->drupalLogin($admin_user); - // Ensure that access to block admin page is denied when theme is disabled. + // Ensure the block admin page cannot be accessed for a disabled theme. $this->drupalGet('admin/structure/block/list/bartik'); $this->assertResponse(404);