diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php index ca106b290f..78a4d5de59 100644 --- a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php +++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php @@ -250,7 +250,7 @@ public function id() { /** * {@inheritdoc} */ - public function preSave(EntityStorageInterface $storage, $update = TRUE) { + public function preSave(EntityStorageInterface $storage) { // Ensure that a region is set on each component. foreach ($this->getComponents() as $name => $component) { $this->handleHiddenType($name, $component); @@ -263,7 +263,7 @@ public function preSave(EntityStorageInterface $storage, $update = TRUE) { ksort($this->content); ksort($this->hidden); - parent::preSave($storage, $update); + parent::preSave($storage); } /** diff --git a/core/lib/Drupal/Core/Field/FieldItemListInterface.php b/core/lib/Drupal/Core/Field/FieldItemListInterface.php index c350432e21..87331306fb 100644 --- a/core/lib/Drupal/Core/Field/FieldItemListInterface.php +++ b/core/lib/Drupal/Core/Field/FieldItemListInterface.php @@ -271,4 +271,15 @@ public static function processDefaultValue($default_value, FieldableEntityInterf */ public function equals(FieldItemListInterface $list_to_compare); + /** + * Gets the field data value. + * + * @param bool $include_computed + * (optional) Whether computed properties should be included. Defaults to + * FALSE. + * + * @return mixed + */ + public function getValue($include_computed = FALSE); + } diff --git a/core/lib/Drupal/Core/TypedData/ComputedItemListTrait.php b/core/lib/Drupal/Core/TypedData/ComputedItemListTrait.php index f6660c4cca..a5413099ce 100644 --- a/core/lib/Drupal/Core/TypedData/ComputedItemListTrait.php +++ b/core/lib/Drupal/Core/TypedData/ComputedItemListTrait.php @@ -39,9 +39,9 @@ protected function ensureComputedValue() { /** * {@inheritdoc} */ - public function getValue() { + public function getValue($include_computed = FALSE) { $this->ensureComputedValue(); - return parent::getValue(); + return parent::getValue($include_computed); } /** diff --git a/core/modules/datetime/src/DateTimeComputed.php b/core/modules/datetime/src/DateTimeComputed.php index 2208ab7cb7..73fb117862 100644 --- a/core/modules/datetime/src/DateTimeComputed.php +++ b/core/modules/datetime/src/DateTimeComputed.php @@ -37,7 +37,7 @@ public function __construct(DataDefinitionInterface $definition, $name = NULL, T /** * {@inheritdoc} */ - public function getValue($langcode = NULL) { + public function getValue() { if ($this->date !== NULL) { return $this->date; } diff --git a/core/modules/forum/src/Form/Overview.php b/core/modules/forum/src/Form/Overview.php index a51446b173..efc9266418 100644 --- a/core/modules/forum/src/Form/Overview.php +++ b/core/modules/forum/src/Form/Overview.php @@ -8,6 +8,7 @@ use Drupal\Core\Url; use Drupal\taxonomy\Form\OverviewTerms; use Drupal\Core\Extension\ModuleHandlerInterface; +use Drupal\taxonomy\VocabularyInterface; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** @@ -47,7 +48,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, FormStateInterface $form_state) { + public function buildForm(array $form, FormStateInterface $form_state, VocabularyInterface $taxonomy_vocabulary = NULL) { $forum_config = $this->config('forum.settings'); $vid = $forum_config->get('vocabulary'); $vocabulary = $this->entityManager->getStorage('taxonomy_vocabulary')->load($vid);