Commit 30ecdb59 authored by john.oltman's avatar john.oltman
Browse files

Issue #2445907 by mr.infinity: Missing tokens for sender mail

parent 2d50c5a4
Loading
Loading
Loading
Loading
+7
Changes for forward.tokens.inc: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ function forward_token_info() {
        'name' => t("Sender's name"),
        'description' => t("Name of sender as entered in Forwarding form."),
      ),
      'sender_email' => array(
        'name' => t("Sender's email address"),
        'description' => t("Email address of sender as entered in Forwarding form."),
      ),
      'entity-type' => array(
        'name' => t("Entity type"),
        'description' => t('The type of entity being forwarded, or "page" if no entity type is available.'),
@@ -65,6 +69,9 @@ function forward_tokens($type, $tokens, array $data, array $options, \Drupal\Cor
        case 'sender':
          $replacements[$original] = isset($data['forward']['sender']) ? Xss::filter($data['forward']['sender']) : t('(Your name)');
          break;
        case 'sender_email':
          $replacements[$original] = isset($data['forward']['sender_email']) ? Xss::filter($data['forward']['sender_email']) : t('(Your email address)');
          break;
      }
    }
  }
+5
Changes for src/Form/ForwardForm.php: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -44,6 +44,11 @@ class ForwardForm extends FormBase {
    } elseif ($this->currentUser()->id()) {
      $token = ['forward' => ['sender' => $this->currentUser()->getDisplayName()]];
    }
    if ($form_state && $form_state->getValue('email')) {
      $token['forward']['sender_email'] = $form_state->getValue('email');
    } elseif ($this->currentUser()->id()) {
      $token['forward']['sender_email'] = $this->currentUser()->getEmail();
    }
    if ($form_state) {
      $token['forward']['entity'] = $form_state->get('#entity');
    }