diff --git a/composer.json b/composer.json index 93286f7b32bfc0464bbcb18dd8f06cbf2d91ec40..f57f2699fedb12e579b9ea5c621281633526df32 100644 --- a/composer.json +++ b/composer.json @@ -283,7 +283,7 @@ }, "drupal/entity_embed": { "2881745": "patches/entity_embed_2881745-22.patch", - "2511404": "https://www.drupal.org/files/issues/2018-09-17/entity-embed-link-2511404-68.patch" + "2511404": "patches/entity-embed-img-link-2511404-68.patch" }, "drupal/smtp": { "2781157": "https://www.drupal.org/files/issues/2018-11-07/2781157-n10.patch" diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index e6b913873ab99a0682be9b6c470c80d2694645f2..e4c2e2ded332cec32be9c212ef5ef88967e69c99 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -3870,7 +3870,7 @@ }, "patches_applied": { "2881745": "patches/entity_embed_2881745-22.patch", - "2511404": "https://www.drupal.org/files/issues/2018-09-17/entity-embed-link-2511404-68.patch" + "2511404": "patches/entity-embed-img-link-2511404-68.patch" } }, "installation-source": "dist", diff --git a/web/modules/entity_embed/entity_embed.module b/web/modules/entity_embed/entity_embed.module index 079bc82a615f91877bcebe32b70ca5a75521940c..ee8fbaee840f24a6ef98274ef7f42dcd1887b8b1 100644 --- a/web/modules/entity_embed/entity_embed.module +++ b/web/modules/entity_embed/entity_embed.module @@ -34,7 +34,7 @@ function template_preprocess_entity_embed_container(&$variables) { $variables['element'] += ['#attributes' => []]; $variables['attributes'] = $variables['element']['#attributes']; $variables['children'] = $variables['element']['#children']; - if (!empty($variables['element']['#context']['data-entity-embed-display-settings']['link_url'])) { + if (!empty($variables['element']['#context']['data-entity-embed-display-settings']['link_url'])) { $link = UrlHelper::filterBadProtocol($variables['element']['#context']['data-entity-embed-display-settings']['link_url']); if (!UrlHelper::isExternal($link)) { $link = 'internal:/' . ltrim($link, '/'); diff --git a/web/modules/entity_embed/src/Form/EntityEmbedDialog.php b/web/modules/entity_embed/src/Form/EntityEmbedDialog.php index a26cbc2ece691f22ad55c9098a25ffa4a128d059..fe16bd97c8c6cb090eaaed6521762067c23814f4 100644 --- a/web/modules/entity_embed/src/Form/EntityEmbedDialog.php +++ b/web/modules/entity_embed/src/Form/EntityEmbedDialog.php @@ -455,11 +455,7 @@ public function buildEmbedStep(array $form, FormStateInterface $form_state) { '#default_value' => isset($entity_element['data-entity-embed-display-settings']['link_url']) ? $this->getUriAsDisplayableString($entity_element['data-entity-embed-display-settings']['link_url']) : '', '#maxlength' => 2048, ]; - $form['attributes']['data-entity-embed-display-settings']['link_url_target'] = [ - '#title' => t('Open in a new window?'), - '#type' => 'checkbox', - '#default_value' => isset($entity_element['data-entity-embed-display-settings']['link_url_target']) ? Html::decodeEntities($entity_element['data-entity-embed-display-settings']['link_url_target']) : '', - ]; + $display = $this->entityEmbedDisplayManager->createInstance($plugin_id, $entity_element['data-entity-embed-display-settings']); $display->setContextValue('entity', $entity); $display->setAttributes($entity_element); @@ -635,9 +631,9 @@ public static function validateUriElement($element, FormStateInterface $form_sta } } - /** - * {@inheritdoc} - */ + /** + * {@inheritdoc} + */ public function validateForm(array &$form, FormStateInterface $form_state) { parent::validateForm($form, $form_state);