Commit ef842157 authored by Andreas De Rijcke's avatar Andreas De Rijcke Committed by davisben
Browse files

Issue #3275649: PHP error on adding a Message as a non-member

parent a8180daf
Loading
Loading
Loading
Loading
+27 −0
Original line number Diff line number Diff line
@@ -10,6 +10,33 @@ use Drupal\Core\Form\FormStateInterface;
 */
class MailGroupMessageForm extends ContentEntityForm {

  /**
   * {@inheritdoc}
   */
  public function validateForm(array &$form, FormStateInterface $form_state) {
    parent::validateForm($form, $form_state);

    /** @var \Drupal\mailgroup\Entity\MailGroupMessageInterface $message */
    $message = $this->getEntity();
    $group = $message->getGroup();
    $sender = $message->getSender();

    if (!$group->isActive()) {
      $message = $this->t('Message to @group not sent. The group is not active.', [
        '@group' => $group->getName(),
      ]);
      $form_state->setError($form, $message);
    }

    if (!$group->isMember($sender)) {
      $message = $this->t('Message to @group rejected. @email is not a member.', [
        '@group' => $group->getName(),
        '@email' => $sender,
      ]);
      $form_state->setError($form, $message);
    }
  }

  /**
   * {@inheritdoc}
   */