diff --git a/core/modules/contact/config/install/contact.form.personal.yml b/core/modules/contact/config/install/contact.form.personal.yml index 5c8559a..f08682a 100644 --- a/core/modules/contact/config/install/contact.form.personal.yml +++ b/core/modules/contact/config/install/contact.form.personal.yml @@ -7,3 +7,4 @@ recipients: { } reply: '' weight: 0 message: 'Your message has been sent.' +redirect: '' diff --git a/core/modules/contact/contact.install b/core/modules/contact/contact.install index dd36d81..61ed1a3 100644 --- a/core/modules/contact/contact.install +++ b/core/modules/contact/contact.install @@ -13,7 +13,9 @@ function contact_install() { $page_front = \Drupal::config('system.site')->get('page.front'); foreach(ContactForm::loadMultiple() as $contact) { - $contact->setRedirectPath($page_front); - $contact->save(); + if ($contact->getRedirectPath()) { + $contact->setRedirectPath($page_front); + $contact->save(); + } } } diff --git a/core/modules/contact/src/ContactFormInterface.php b/core/modules/contact/src/ContactFormInterface.php index 063553b..12f05fc 100644 --- a/core/modules/contact/src/ContactFormInterface.php +++ b/core/modules/contact/src/ContactFormInterface.php @@ -8,7 +8,6 @@ namespace Drupal\contact; use Drupal\Core\Config\Entity\ConfigEntityInterface; -use Drupal\Core\Url; /** * Provides an interface defining a contact form entity. diff --git a/core/modules/contact/tests/modules/contact_test/config/install/contact.form.feedback.yml b/core/modules/contact/tests/modules/contact_test/config/install/contact.form.feedback.yml index 9e3b2ad..6496149 100644 --- a/core/modules/contact/tests/modules/contact_test/config/install/contact.form.feedback.yml +++ b/core/modules/contact/tests/modules/contact_test/config/install/contact.form.feedback.yml @@ -6,3 +6,4 @@ weight: 0 status: true langcode: en message: 'Your message has been sent.' +redirect: '/' diff --git a/core/profiles/standard/config/install/contact.form.feedback.yml b/core/profiles/standard/config/install/contact.form.feedback.yml index 30eb37a..94e2a9a 100644 --- a/core/profiles/standard/config/install/contact.form.feedback.yml +++ b/core/profiles/standard/config/install/contact.form.feedback.yml @@ -8,3 +8,4 @@ recipients: reply: '' weight: 0 message: 'Your message has been sent.' +redirect: '/'