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/domain_access/src/Plugin/Action/DomainAccessActionBase.php b/domain_access/src/Plugin/Action/DomainAccessActionBase.php | |
index dfc2b944..b61f5691 100644 | |
--- a/domain_access/src/Plugin/Action/DomainAccessActionBase.php | |
+++ b/domain_access/src/Plugin/Action/DomainAccessActionBase.php | |
@@ -72,7 +72,7 @@ abstract class DomainAccessActionBase extends ConfigurableActionBase implements | |
'#type' => 'checkboxes', | |
'#title' => t('Domain'), | |
'#options' => $domains, | |
- '#default_value' => $this->configuration['id'], | |
+ '#default_value' => $this->configuration['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/config/schema/address.schema.yml b/config/schema/address.schema.yml | |
index e706c72..a9643b8 100644 | |
--- a/config/schema/address.schema.yml | |
+++ b/config/schema/address.schema.yml | |
@@ -151,6 +151,11 @@ field.widget.settings.address_default: | |
wrapper_type: | |
type: string | |
label: Wrapper type | |
+ preferred_countries: | |
+ type: sequence |
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/icons/twitter.svg b/icons/twitter.svg | |
index 293c100..e52bbc8 100644 | |
--- a/icons/twitter.svg | |
+++ b/icons/twitter.svg | |
@@ -1,12 +1,30 @@ | |
-<?xml version="1.0" encoding="UTF-8"?> | |
-<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |
- <!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch --> | |
- <title>Shape</title> | |
- <desc>Created with Sketch.</desc> |
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/views/src/Form/ViewsExposedForm.php b/core/modules/views/src/Form/ViewsExposedForm.php | |
index d68b1dd5363..828ca44ea9c 100644 | |
--- a/core/modules/views/src/Form/ViewsExposedForm.php | |
+++ b/core/modules/views/src/Form/ViewsExposedForm.php | |
@@ -10,6 +10,7 @@ | |
use Drupal\Core\Render\Element\Checkboxes; | |
use Drupal\Core\Url; | |
use Drupal\views\ExposedFormCache; | |
+use Drupal\views\Views; | |
use Symfony\Component\DependencyInjection\ContainerInterface; |
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/webform_access/src/WebformAccessGroupListBuilder.php b/modules/webform_access/src/WebformAccessGroupListBuilder.php | |
index 7c731d4f1..83e0c3ef2 100644 | |
--- a/modules/webform_access/src/WebformAccessGroupListBuilder.php | |
+++ b/modules/webform_access/src/WebformAccessGroupListBuilder.php | |
@@ -64,7 +64,7 @@ class WebformAccessGroupListBuilder extends ConfigEntityListBuilder { | |
// Table. | |
$build += parent::render(); | |
- $build['table']['#sticky'] = TRUE; | |
+ $build['table']['#sticky'] = FALSE; |
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/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 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 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') { |
NewerOlder