Skip to content

[5.3] display email address in contact #3420

@jgerman-bot

Description

@jgerman-bot

New language relevant PR in upstream repo: joomla/joomla-cms#44792 Here are the upstream changes:

Click to expand the diff!
diff --git a/language/en-GB/com_contact.ini b/language/en-GB/com_contact.ini
index ad1c8fb320e5a..d8e690176b449 100644
--- a/language/en-GB/com_contact.ini
+++ b/language/en-GB/com_contact.ini
@@ -29,7 +29,7 @@ COM_CONTACT_EMAIL_FORM="Contact Form"
 COM_CONTACT_EMAIL_LABEL="Email"
 COM_CONTACT_EMAIL_THANKS="Thank you for your email."
 COM_CONTACT_ENQUIRY_SUBJECT="{SITENAME}: {SUBJECT}"
-COM_CONTACT_ENQUIRY_TEXT="This is an enquiry email via {URL} from:\n{NAME} <{EMAIL}>\n\n{BODY}\n\n{CUSTOMFIELDS}"
+COM_CONTACT_ENQUIRY_TEXT="This is an enquiry email via {URL} from:\n{NAME} {EMAIL}\n\n{BODY}\n\n{CUSTOMFIELDS}"
 COM_CONTACT_ERROR_CONTACT_NOT_FOUND="Contact not found"
 COM_CONTACT_ERROR_UNIQUE_ALIAS="Another Contact in this category has the same alias."
 COM_CONTACT_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Contact in this category has the same alias."
diff --git a/tests/System/integration/api/com_contact/Contacts.cy.js b/tests/System/integration/api/com_contact/Contacts.cy.js
index 0e428f617debe..edf5dc4e29563 100644
--- a/tests/System/integration/api/com_contact/Contacts.cy.js
+++ b/tests/System/integration/api/com_contact/Contacts.cy.js
@@ -62,7 +62,7 @@ describe('Test that contacts API endpoint', () => {
       cy.wrap(mails[0].receivers).should('have.property', Cypress.env('email'));
       cy.wrap(mails[0].headers.subject).should('equal', `${Cypress.env('sitename')}: automated test subject`);
       cy.wrap(mails[0].body).should('have.string', 'This is an enquiry email via');
-      cy.wrap(mails[0].body).should('have.string', `${Cypress.env('name')} <${Cypress.env('email')}>`);
+      cy.wrap(mails[0].body).should('have.string', `${Cypress.env('name')} ${Cypress.env('email')}`);
       cy.wrap(mails[0].body).should('have.string', 'automated test message');
     });
   });

Metadata

Metadata

Assignees

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions