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/Block/MiniLayout.php b/src/Plugin/Block/MiniLayout.php | |
index 7306a81c2b2ec5e49522661b4edd61ff2bc8d132..50576902abafc5a17a8e5b90ec75248423afdaf4 100644 | |
--- a/src/Plugin/Block/MiniLayout.php | |
+++ b/src/Plugin/Block/MiniLayout.php | |
@@ -24,6 +24,11 @@ use Drupal\Core\Plugin\Context\ContextRepositoryInterface; | |
*/ | |
class MiniLayout extends BlockBase implements ContextAwarePluginInterface, ContainerFactoryPluginInterface { | |
+ /** | |
+ * @var Drupal\Core\Entity\EntityTypeManagerInterface; |
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/module.config.php b/config/module.config.php | |
index 88b4c68..37e2414 100644 | |
--- a/config/module.config.php | |
+++ b/config/module.config.php | |
@@ -58,9 +58,9 @@ return [ | |
], | |
], | |
'controllers' => [ | |
- 'invokables' => [ | |
+ 'factories' => [ |
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/migrate/source/d7/FieldCollectionItem.php b/src/Plugin/migrate/source/d7/FieldCollectionItem.php | |
index 0dc9460..f34fc2d 100644 | |
--- a/src/Plugin/migrate/source/d7/FieldCollectionItem.php | |
+++ b/src/Plugin/migrate/source/d7/FieldCollectionItem.php | |
@@ -71,8 +71,12 @@ class FieldCollectionItem extends FieldableEntity { | |
]) | |
->range(0, 1); | |
$parent_row = $query->execute()->fetchObject(); | |
+ $parent_type = $parent_row->entity_type; | |
+ if ($parent_type == 'field_collection_item') { |
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; |