From: Stephen Cameron
Date: Mon, 27 Jul 2020 17:53:26 +0000 (+0200)
Subject: Wait #3445 @2
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ba328e8a7b981efd7ef00954896f82b118800d89;p=ccv-wordpress.git
Wait #3445 @2
---
diff --git a/wp-content/mu-plugins/cube/src/Forms/Base.php b/wp-content/mu-plugins/cube/src/Forms/Base.php
index 69a13a4..5ce0cd1 100644
--- a/wp-content/mu-plugins/cube/src/Forms/Base.php
+++ b/wp-content/mu-plugins/cube/src/Forms/Base.php
@@ -236,14 +236,12 @@ class Base
$data = [];
$to = $this->destination;
- $from = 'CCV ';
+ $from = 'CCV Montpellier ';
$subject = $this->form_title;
$content_type = 'text/html';
$charset = get_bloginfo('charset');
$headers[] = sprintf('Content-Type: %s; charset=%s', $content_type, $charset);
-
- //TODO: Set up SMTP delivery via CCV's server if we want to change the from address. Attempting to set this results in messages never arriving (starting 30/04/20)
- //$headers[] = sprintf('From: %s', $from);
+ $headers[] = sprintf('From: %s', $from);
// Gather filled fields into label/value pairs
foreach ($this->fields as $field_name => $field) {
diff --git a/wp-content/themes/CCV/resources/views/forms/consultation.blade.php b/wp-content/themes/CCV/resources/views/forms/consultation.blade.php
index 8051175..9e93cbe 100644
--- a/wp-content/themes/CCV/resources/views/forms/consultation.blade.php
+++ b/wp-content/themes/CCV/resources/views/forms/consultation.blade.php
@@ -162,7 +162,7 @@