Skip to content

Commit e95e9d1

Browse files
authored
Merge pull request #63 from itk-dev/develop
Release 2021-12-16
2 parents e67ab7b + 54be8bf commit e95e9d1

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,9 @@
200200
},
201201
"drupal/inline_entity_form": {
202202
"Fix bug in inline entity form": "https://www.drupal.org/files/issues/2020-11-18/inline_entity_form-required_fields_optional_ief-3099844-15.patch"
203+
},
204+
"drupal/masquerade": {
205+
"https://www.drupal.org/project/masquerade/issues/2962970#comment-13391256": "https://www.drupal.org/files/issues/2019-12-13/temporary%20unmask%20workaround-2962970-8.patch"
203206
}
204207
}
205208
},

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/profiles/custom/os2loop/modules/os2loop_messages/src/Helper/Helper.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ public function entityUpdate(EntityInterface $entity) {
6969
private function createMessage(EntityInterface $entity, string $operation) {
7070
$template = $this->getMessageTemplate($entity, $operation);
7171
if (NULL !== $template) {
72+
$node = NULL;
7273
$message = Message::create(['template' => $template]);
7374
if ($entity instanceof NodeInterface) {
75+
$node = $entity;
7476
if ($entity->hasField('os2loop_notify_users') && !(bool) $entity->get('os2loop_notify_users')->getString()) {
7577
return;
7678
}
@@ -85,7 +87,11 @@ private function createMessage(EntityInterface $entity, string $operation) {
8587
$message->set('os2loop_message_node_refer', $node);
8688
$message->set('os2loop_message_comment_refer', $entity);
8789
}
88-
$message->save();
90+
91+
// Only save message on published content.
92+
if ($node instanceof NodeInterface && $node->isPublished()) {
93+
$message->save();
94+
}
8995
}
9096
}
9197

web/profiles/custom/os2loop/modules/os2loop_oembed/src/TwigExtension/TwigExtension.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ public function createVideo(array $text): ?string {
124124
'provider' => 'Microsoft Stream',
125125
'requiredCookies' => NULL,
126126
],
127+
'dreambroker.com' => [
128+
'type' => 'custom',
129+
'requiredCookies' => 'cookie_cat_statistic',
130+
],
127131

128132
];
129133

0 commit comments

Comments
 (0)