Commit 76de44fb authored by Andrii Chyrskyi's avatar Andrii Chyrskyi Committed by ronaldtebrake
Browse files

Issue #3246751 by milos.kroulik, Ressinel: Add extra check for Message entity.

parent 58f76c9b
Loading
Loading
Loading
Loading
+5 −0
Changes for modules/social_features/social_event/modules/social_event_invite/social_event_invite.tokens.inc: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@

use Drupal\Core\Render\BubbleableMetadata;
use Drupal\Core\Url;
use Drupal\message\Entity\Message;
use Drupal\user\Entity\User;

/**
@@ -82,6 +83,7 @@ function social_event_invite_tokens($type, $tokens, array $data, array $options,
        /** @var \Drupal\message\Entity\Message $message */
        $message = $data['message'];

        if ($message instanceof Message) {
          // Load the current Event enrollments so we can check duplicates.
          $storage = \Drupal::entityTypeManager()->getStorage('event_enrollment');
          /** @var \Drupal\social_event\EventEnrollmentInterface $event_enrollment */
@@ -96,10 +98,12 @@ function social_event_invite_tokens($type, $tokens, array $data, array $options,
            $replacements[$original] = $login_link;
          }
        }
      }
      if ($name == 'user_login_event_invites_overview') {
        /** @var \Drupal\message\Entity\Message $message */
        $message = $data['message'];

        if ($message instanceof Message) {
          // Load the current Event enrollments so we can check duplicates.
          $storage = \Drupal::entityTypeManager()->getStorage('event_enrollment');
          /** @var \Drupal\social_event\EventEnrollmentInterface $event_enrollment */
@@ -113,5 +117,6 @@ function social_event_invite_tokens($type, $tokens, array $data, array $options,
        }
      }
    }
  }
  return $replacements;
}