This file contains hidden or 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 3ea593c1f8..0962de179b 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 hidden or 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/config/install/wysiwyg_template.settings.yml b/config/install/wysiwyg_template.settings.yml | |
index 8b3a650..b2380fd 100644 | |
--- a/config/install/wysiwyg_template.settings.yml | |
+++ b/config/install/wysiwyg_template.settings.yml | |
@@ -1 +1,3 @@ | |
library_path: 'libraries/templates' | |
+editor_css: '' | |
+view_css: '' | |
diff --git a/config/schema/wysiwyg_template.schema.yml b/config/schema/wysiwyg_template.schema.yml | |
index 46c694a..857962c 100644 |
This file contains hidden or 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/EncryptStreamWrapper.php b/src/EncryptStreamWrapper.php | |
index 68b0357..e3e31af 100644 | |
--- a/src/EncryptStreamWrapper.php | |
+++ b/src/EncryptStreamWrapper.php | |
@@ -96,7 +96,7 @@ class EncryptStreamWrapper extends LocalStream { | |
* The base path for encrypt://. | |
*/ | |
public static function basePath() { | |
- return Settings::get('encrypted_file_path', ''); | |
+ return Settings::get('encrypted_file_path', \Drupal::getContainer()->getParameter('site.path') . '/private/files-encrypted'); |
This file contains hidden or 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
--- a/src/Plugin/migrate/process/AddressField.php | |
+++ a/src/Plugin/migrate/process/AddressField.php | |
@@ -19,6 +19,9 @@ | |
* {@inheritdoc} | |
*/ | |
public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) { | |
+ if (empty($value)) { | |
+ return []; | |
+ } | |
$parsed = [ |
This file contains hidden or 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
--- a/src/Plugin/Field/FieldType/EntityReferenceRevisionsItem.php | |
+++ b/src/Plugin/Field/FieldType/EntityReferenceRevisionsItem.php | |
@@ -279,7 +279,7 @@ | |
$is_affected = !$this->getFieldDefinition()->isTranslatable() || ($host instanceof TranslatableRevisionableInterface && $host->hasTranslationChanges()); | |
if ($is_affected && !$host->isNew() && $this->entity && $this->entity->getEntityType()->get('entity_revision_parent_id_field')) { | |
if ($host->isNewRevision()) { | |
- $this->entity->setNewRevision(); | |
+ $this->entity->setNewRevision(php_sapi_name() != 'cli'); | |
$needs_save = TRUE; | |
} |
This file contains hidden or 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
--- 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 @@ | |
]; | |
} | |
+ /** | |
+ * {@inheritdoc} | |
+ */ | |
+ public function getFieldWidgetMap() { |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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. |