diff --git modules/block/block.module modules/block/block.module index e45c8d2..262de36 100644 --- modules/block/block.module +++ modules/block/block.module @@ -113,11 +113,6 @@ function block_menu() { 'access arguments' => array('administer blocks'), 'file' => 'block.admin.inc', ); - $items['admin/structure/block/list'] = array( - 'title' => 'List', - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -10, - ); $items['admin/structure/block/manage/%/%'] = array( 'title' => 'Configure block', 'page callback' => 'drupal_get_form', @@ -148,7 +143,7 @@ function block_menu() { 'file' => 'block.admin.inc', ); foreach (list_themes() as $key => $theme) { - $items['admin/structure/block/list/' . $key] = array( + $items['admin/structure/block/' . $key] = array( 'title' => check_plain($theme->info['name']), 'page arguments' => array($key), 'type' => $key == $default_theme ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK, @@ -158,7 +153,7 @@ function block_menu() { 'file' => 'block.admin.inc', ); if ($key != $default_theme) { - $items['admin/structure/block/list/' . $key . '/add'] = array( + $items['admin/structure/block/' . $key . '/add'] = array( 'title' => 'Add block', 'page callback' => 'drupal_get_form', 'page arguments' => array('block_add_block_form'), diff --git modules/block/block.test modules/block/block.test index db8a257..9622ab1 100644 --- modules/block/block.test +++ modules/block/block.test @@ -47,8 +47,8 @@ class BlockTestCase extends DrupalWebTestCase { // Confirm that the add block link appears on block overview pages. $this->drupalGet('admin/structure/block'); $this->assertRaw(l('Add block', 'admin/structure/block/add'), t('Add block link is present on block overview page for default theme.')); - $this->drupalGet('admin/structure/block/list/seven'); - $this->assertRaw(l('Add block', 'admin/structure/block/list/seven/add'), t('Add block link is present on block overview page for non-default theme.')); + $this->drupalGet('admin/structure/block/seven'); + $this->assertRaw(l('Add block', 'admin/structure/block/seven/add'), t('Add block link is present on block overview page for non-default theme.')); // Confirm that hidden regions are not shown as options for block placement // when adding a new block. @@ -297,7 +297,7 @@ class NonDefaultBlockAdmin extends DrupalWebTestCase { $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer themes')); $this->drupalLogin($admin_user); theme_enable(array('stark')); - $this->drupalGet('admin/structure/block/list/stark'); + $this->drupalGet('admin/structure/block/stark'); } } @@ -372,13 +372,13 @@ class BlockAdminThemeTestCase extends DrupalWebTestCase { $this->drupalLogin($admin_user); // Ensure that access to block admin page is denied when theme is disabled. - $this->drupalGet('admin/structure/block/list/stark'); + $this->drupalGet('admin/structure/block/stark'); $this->assertResponse(403, t('The block admin page for a disabled theme can not be accessed')); // Enable admin theme and confirm that tab is accessible. $edit['admin_theme'] = 'stark'; $this->drupalPost('admin/appearance', $edit, t('Save configuration')); - $this->drupalGet('admin/structure/block/list/stark'); + $this->drupalGet('admin/structure/block/stark'); $this->assertResponse(200, t('The block admin page for the admin theme can be accessed')); } }