diff --git a/core/includes/entity.inc b/core/includes/entity.inc index 643575c..d79381a 100644 --- a/core/includes/entity.inc +++ b/core/includes/entity.inc @@ -337,6 +337,9 @@ function entity_page_label(EntityInterface $entity, $langcode = NULL) { * The entity to be rendered. * @param string $view_mode * The view mode that should be used to display the entity. + * @param string $langcode + * (optional) For which language the entity should be rendered, defaults to + * the current content language. * @param bool $reset * (optional) Whether to reset the render cache for the requested entity. * Defaults to FALSE. @@ -354,12 +357,12 @@ function entity_page_label(EntityInterface $entity, $langcode = NULL) { * @see \Drupal\Core\Entity\EntityManagerInterface::getViewBuilder() * @see \Drupal\Core\Entity\EntityViewBuilderInterface::view() */ -function entity_view(EntityInterface $entity, $view_mode, $reset = FALSE) { +function entity_view(EntityInterface $entity, $view_mode, $langcode = NULL, $reset = FALSE) { $render_controller = \Drupal::entityManager()->getViewBuilder($entity->getEntityTypeId()); if ($reset) { - $render_controller->resetCache(array($entity->id())); + $render_controller->resetCache([$entity]); } - return $render_controller->view($entity, $view_mode); + return $render_controller->view($entity, $view_mode, $langcode); } /** @@ -369,6 +372,9 @@ function entity_view(EntityInterface $entity, $view_mode, $reset = FALSE) { * The entities to be rendered, must be of the same type. * @param string $view_mode * The view mode that should be used to display the entity. + * @param string $langcode + * (optional) For which language the entity should be rendered, defaults to + * the current content language. * @param bool $reset * (optional) Whether to reset the render cache for the requested entities. * Defaults to FALSE. @@ -388,12 +394,12 @@ function entity_view(EntityInterface $entity, $view_mode, $reset = FALSE) { * @see \Drupal\Core\Entity\EntityManagerInterface::getViewBuilder() * @see \Drupal\Core\Entity\EntityViewBuilderInterface::viewMultiple() */ -function entity_view_multiple(array $entities, $view_mode, $reset = FALSE) { +function entity_view_multiple(array $entities, $view_mode, $langcode = NULL, $reset = FALSE) { $render_controller = \Drupal::entityManager()->getViewBuilder(reset($entities)->getEntityTypeId()); if ($reset) { - $render_controller->resetCache(array_keys($entities)); + $render_controller->resetCache($entities); } - return $render_controller->viewMultiple($entities, $view_mode); + return $render_controller->viewMultiple($entities, $view_mode, $langcode); } /** diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php index cc0deaf..d212474 100644 --- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php +++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php @@ -254,8 +254,8 @@ public function buildMultiple(array $build_list) { $entity = $build_list[$key][$entity_type_key]; $display = $displays[$entity->bundle()]; - $this->moduleHandler()->invokeAll($view_hook, array(&$build_list[$key], $entity, $display, $view_mode)); - $this->moduleHandler()->invokeAll('entity_view', array(&$build_list[$key], $entity, $display, $view_mode)); + $this->moduleHandler()->invokeAll($view_hook, [&$build_list[$key], $entity, $display, $view_mode]); + $this->moduleHandler()->invokeAll('entity_view', [&$build_list[$key], $entity, $display, $view_mode]); $this->alterBuild($build_list[$key], $entity, $display, $view_mode); diff --git a/core/modules/node/src/Plugin/Search/NodeSearch.php b/core/modules/node/src/Plugin/Search/NodeSearch.php index 0c2c55e..8861521 100644 --- a/core/modules/node/src/Plugin/Search/NodeSearch.php +++ b/core/modules/node/src/Plugin/Search/NodeSearch.php @@ -337,9 +337,9 @@ protected function prepareResults(StatementInterface $found) { // Fetch comments for snippet. $rendered = $this->renderer->renderPlain($build); $this->addCacheableDependency(CacheableMetadata::createFromRenderArray($build)); - $rendered .= ' ' . $this->moduleHandler->invoke('comment', 'node_update_index', array($node)); + $rendered .= ' ' . $this->moduleHandler->invoke('comment', 'node_update_index', [$node]); - $extra = $this->moduleHandler->invokeAll('node_search_result', array($node)); + $extra = $this->moduleHandler->invokeAll('node_search_result', [$node]); $language = $this->languageManager->getLanguage($item->langcode); $username = array(