From 32e23b5719e876488be09421f7733f952b1fa1e3 Mon Sep 17 00:00:00 2001 From: Dries Date: Wed, 16 Jan 2013 08:20:26 -0500 Subject: [PATCH] Issue #1888942 by dawehner: Rename viewStorageController::attachDisplays(). --- .../views/lib/Drupal/views/ViewStorageController.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/modules/views/lib/Drupal/views/ViewStorageController.php b/core/modules/views/lib/Drupal/views/ViewStorageController.php index a3a3437c9cf..8a5f87ae6ca 100644 --- a/core/modules/views/lib/Drupal/views/ViewStorageController.php +++ b/core/modules/views/lib/Drupal/views/ViewStorageController.php @@ -35,7 +35,7 @@ class ViewStorageController extends ConfigStorageController { */ protected function attachLoad(&$queried_entities, $revision_id = FALSE) { foreach ($queried_entities as $id => $entity) { - $this->attachDisplays($entity); + $this->mergeDefaultDisplaysOptions($entity); } parent::attachLoad($queried_entities, $revision_id); @@ -70,16 +70,17 @@ class ViewStorageController extends ConfigStorageController { $entity = parent::create($values); - $this->attachDisplays($entity); + $this->mergeDefaultDisplaysOptions($entity); return $entity; } /** * Add defaults to the display options. * - * @param Drupal\Core\Entity\EntityInterface $entity + * @param \Drupal\Core\Entity\EntityInterface $entity + * The view entity to attach default displays options. */ - protected function attachDisplays(EntityInterface $entity) { + protected function mergeDefaultDisplaysOptions(EntityInterface $entity) { if (isset($entity->display) && is_array($entity->display)) { $displays = array();