diff --git a/core/lib/Drupal/Core/Menu/LocalTaskManager.php b/core/lib/Drupal/Core/Menu/LocalTaskManager.php index e446e80..4b117c6 100644 --- a/core/lib/Drupal/Core/Menu/LocalTaskManager.php +++ b/core/lib/Drupal/Core/Menu/LocalTaskManager.php @@ -117,7 +117,6 @@ public function __construct(ControllerResolverInterface $controller_resolver, Re $this->accessManager = $access_manager; $this->alterInfo($module_handler, 'local_tasks'); $this->setCacheBackend($cache, $language_manager, 'local_task_plugins', array('local_task' => TRUE)); - $this->cacheBackend = new NullBackend('local_tasks'); } /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php index af6faed..9bacd4c 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php @@ -293,12 +293,6 @@ public function executeHookMenu($callbacks) { // Insert item into the proper menu. $items[$path]['menu_name'] = $menu['name']; break; - case 'tab': - $items[$path]['type'] = MENU_CALLBACK; - break; - case 'default tab': - $items[$path]['type'] = MENU_CALLBACK; - break; } // Add context for contextual links. @@ -309,6 +303,9 @@ public function executeHookMenu($callbacks) { $items[$path]['context'] = MENU_CONTEXT_INLINE; $items[$path]['type'] = MENU_LOCAL_TASK; } + else { + $items[$path]['type'] = MENU_CALLBACK; + } // If this is a 'default' tab, check to see if we have to create the // parent menu item. diff --git a/core/modules/views/views.local_tasks.yml b/core/modules/views/views.local_tasks.yml index 624aeb7..f050e64 100644 --- a/core/modules/views/views.local_tasks.yml +++ b/core/modules/views/views.local_tasks.yml @@ -1,3 +1,3 @@ views_view: - class: \Drupal\views\Plugin\Menu\LocalTask\ViewsLocalTask + class: Drupal\Core\Menu\LocalTaskDefault derivative: \Drupal\views\Plugin\Derivative\ViewsLocalTask diff --git a/core/modules/views/views.module b/core/modules/views/views.module index afea01f..449e864 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -1608,5 +1608,4 @@ function views_local_tasks_alter(&$local_tasks) { $container = \Drupal::getContainer(); $local_task = ViewsLocalTask::create($container, 'views_view'); $local_task->alterLocalTasks($local_tasks); - $foo = 123; }