This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/Plugin/Field/FieldFormatter/ComputedStringFormatter.php b/src/Plugin/Field/FieldFormatter/ComputedStringFormatter.php | |
index 583c34e..b160b07 100644 | |
--- a/src/Plugin/Field/FieldFormatter/ComputedStringFormatter.php | |
+++ b/src/Plugin/Field/FieldFormatter/ComputedStringFormatter.php | |
@@ -60,10 +60,10 @@ class ComputedStringFormatter extends ComputedFormatterBase { | |
protected function prepareValue($value) { | |
if ($this->getSetting('sanitized')) { | |
- return nl2br(Html::escape($value)); | |
+ return !empty($value) ? nl2br(Html::escape($value)) : $value; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/modules/wysiwyg_template_core/tests/src/Kernel/Plugin/Filter/FilterTemplatesTest.php b/modules/wysiwyg_template_core/tests/src/Kernel/Plugin/Filter/FilterTemplatesTest.php | |
index 563811a..8663ce4 100644 | |
--- a/modules/wysiwyg_template_core/tests/src/Kernel/Plugin/Filter/FilterTemplatesTest.php | |
+++ b/modules/wysiwyg_template_core/tests/src/Kernel/Plugin/Filter/FilterTemplatesTest.php | |
@@ -17,7 +17,7 @@ class FilterTemplatesTest extends KernelTestBase { | |
/** | |
* {@inheritdoc} | |
*/ | |
- public static $modules = ['filter', 'wysiwyg_template_core']; | |
+ protected static $modules = ['filter', 'wysiwyg_template_core']; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/migrations/d7_field_collection.yml b/migrations/d7_field_collection.yml | |
index a7077d3..4c9be52 100644 | |
--- a/migrations/d7_field_collection.yml | |
+++ b/migrations/d7_field_collection.yml | |
@@ -8,6 +8,8 @@ deriver: Drupal\paragraphs\Plugin\migrate\D7FieldCollectionItemDeriver | |
source: | |
plugin: d7_field_collection_item | |
process: | |
+ id: item_id | |
+ revision_id: revision_id |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/core/modules/datetime/src/Plugin/views/filter/Date.php b/core/modules/datetime/src/Plugin/views/filter/Date.php | |
index f73a675fef..a303e3060f 100644 | |
--- a/core/modules/datetime/src/Plugin/views/filter/Date.php | |
+++ b/core/modules/datetime/src/Plugin/views/filter/Date.php | |
@@ -109,6 +109,11 @@ protected function opBetween($field) { | |
// value as UNIX timestamp 0. | |
$min = (!empty($this->value['min'])) ? $this->value['min'] : '@0'; | |
+ if (!empty($this->value['max']) && !strpos($this->value['max'], ':')) { | |
+ // No time was specified, so make the date range inclusive. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/core/modules/field/src/Plugin/migrate/field/d7/EntityReference.php b/core/modules/field/src/Plugin/migrate/field/d7/EntityReference.php | |
index bebb360d63..321d1f856a 100644 | |
--- a/core/modules/field/src/Plugin/migrate/field/d7/EntityReference.php | |
+++ b/core/modules/field/src/Plugin/migrate/field/d7/EntityReference.php | |
@@ -32,4 +32,15 @@ public function getFieldFormatterMap() { | |
]; | |
} | |
+ /** | |
+ * {@inheritdoc} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/core/modules/file/src/Plugin/migrate/field/d6/FileField.php b/core/modules/file/src/Plugin/migrate/field/d6/FileField.php | |
index 804e34a655..0d4b4d3f64 100644 | |
--- a/core/modules/file/src/Plugin/migrate/field/d6/FileField.php | |
+++ b/core/modules/file/src/Plugin/migrate/field/d6/FileField.php | |
@@ -38,6 +38,7 @@ public function getFieldFormatterMap() { | |
'image_plain' => 'image', | |
'image_nodelink' => 'image', | |
'image_imagelink' => 'image', | |
+ 'file_download_link' => 'generic_media_link', | |
]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceSettings.php b/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceSettings.php | |
index 5236e5507a..fcf66af257 100644 | |
--- a/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceSettings.php | |
+++ b/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceSettings.php | |
@@ -126,6 +126,18 @@ public function transform($value, MigrateExecutableInterface $migrate_executable | |
'uuid' => '', | |
]; | |
break; | |
+ case 'media_generic': | |
+ $settings = $instance_settings; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/modules/mailchimp_signup/src/Plugin/Block/MailchimpSignupSubscribeBlock.php b/modules/mailchimp_signup/src/Plugin/Block/MailchimpSignupSubscribeBlock.php | |
index 1798344..3ff60c9 100644 | |
--- a/modules/mailchimp_signup/src/Plugin/Block/MailchimpSignupSubscribeBlock.php | |
+++ b/modules/mailchimp_signup/src/Plugin/Block/MailchimpSignupSubscribeBlock.php | |
@@ -9,6 +9,8 @@ use Drupal\Core\Messenger\MessengerInterface; | |
use Drupal\Core\Plugin\ContainerFactoryPluginInterface; | |
use Drupal\mailchimp_signup\Entity\MailchimpSignup; | |
use Symfony\Component\DependencyInjection\ContainerInterface; | |
+use Drupal\Core\Form\FormStateInterface; | |
+use Drupal\Component\Utility\NestedArray; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/core/modules/field/src/Plugin/migrate/process/d7/FieldSettings.php b/core/modules/field/src/Plugin/migrate/process/d7/FieldSettings.php | |
index a18e4fac99..e35163b284 100644 | |
--- a/core/modules/field/src/Plugin/migrate/process/d7/FieldSettings.php | |
+++ b/core/modules/field/src/Plugin/migrate/process/d7/FieldSettings.php | |
@@ -44,6 +44,10 @@ public function transform($value, MigrateExecutableInterface $migrate_executable | |
case 'user_reference': | |
$value['target_type'] = 'user'; | |
break; | |
+ case 'entityreference': | |
+ if ($value['target_type'] == 'profile2') { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/Plugin/migrate/source/d7/FieldCollectionItem.php b/src/Plugin/migrate/source/d7/FieldCollectionItem.php | |
index 50af07d..0dc9460 100644 | |
--- a/src/Plugin/migrate/source/d7/FieldCollectionItem.php | |
+++ b/src/Plugin/migrate/source/d7/FieldCollectionItem.php | |
@@ -50,9 +50,6 @@ class FieldCollectionItem extends FieldableEntity { | |
// bundles retrieved. | |
if ($this->configuration['field_name']) { | |
$query->condition('f.field_name', $this->configuration['field_name']); | |
- $query->addField('fc', 'entity_type', 'parent_type'); | |
- $query->addField('fc', 'entity_id', 'parent_id'); |
NewerOlder