Verified Commit f76bfd35 authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3345385 by cafuego: Local variable $additional_headers in PhpMail is... 

Issue #3345385 by cafuego: Local variable $additional_headers in PhpMail is confusing, rename to $additional_params

(cherry picked from commit f2e3f701)
parent 7375db52

core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php

+2 −2
Original line number Diff line number Diff line
@@ -121,13 +121,13 @@ public function mail(array $message) { 
      // We validate the return path, unless it is equal to the site mail, which

      // we assume to be safe.

      $site_mail = $this->configFactory->get('system.site')->get('mail');

      $additional_headers = isset($message['Return-Path']) && ($site_mail === $message['Return-Path'] || static::_isShellSafe($message['Return-Path'])) ? '-f' . $message['Return-Path'] : '';

      $additional_params = isset($message['Return-Path']) && ($site_mail === $message['Return-Path'] || static::_isShellSafe($message['Return-Path'])) ? '-f' . $message['Return-Path'] : '';

      $mail_result = $this->doMail(

        $message['to'],

        $mail_subject,

        $mail_body,

        $mail_headers,

        $additional_headers

        $additional_params

      );

    }

    else {