Skip to content

Contact Form: Send all emails through wrapper to ensure consistency#7214

Merged
zinigor merged 1 commit intomasterfrom
fix/7179-grunion-ham-html
May 26, 2017
Merged

Contact Form: Send all emails through wrapper to ensure consistency#7214
zinigor merged 1 commit intomasterfrom
fix/7179-grunion-ham-html

Conversation

@iandunn
Copy link
Copy Markdown

@iandunn iandunn commented May 19, 2017

Fixes #7179

Changes proposed in this Pull Request:

Send all outbound Grunion messages through a wrapper that ensures they are correctly rendered as HTML.

Testing instructions:

  1. Add the mu-plugin below to your installation

  2. Checkout master

  3. Send an email. It will be flagged as spam because of the filter.

  4. Browse to Feedback > Spam

  5. Click Not Spam

  6. View the email. It will have a text/plain content type, and show raw HTML in the body

  7. Checkout this branch and repeat the steps above. It should have a text/html content type and show rendered HTML in the body.

  8. Disable the filter and test messages that aren't flagged as spam. They should also have the text/html content-type and show rendered HTML.

mu-plugin for testing:

add_filter( 'jetpack_contact_form_is_spam', function( $is_spam, $akismet_values ) {
	return true;
}, 10, 2 );

@iandunn
Contact Form: Send all emails through wrapper to ensure consistency
243619c 
Previously the two `wp_mail()` calls in `Grunion_Contact_Form::process_submission()` had extra filters around them in order to support HTML messages. The `wp_mail()` call in `grunion_ajax_spam()` was missing those filters, though. That resulted in ham messages being sent with a `plain-text` content type, but with HTML markup in the body.

Sending all `wp_mail()` calls fixes that particular issue, and also makes it much less likely that a similar bug will happen in the future, because it is DRY.

Fixes #7179
@iandunn iandunn added [Feature] Forms Bug When a feature is broken and / or not performing as intended labels May 19, 2017
@jeherve jeherve added [Pri] High [Status] Needs Review This PR is ready for review. labels May 19, 2017
@jeherve jeherve added this to the 5.0 milestone May 26, 2017
@eliorivero
Copy link
Copy Markdown
Contributor

eliorivero commented May 26, 2017

Fantastic! 🐑

@eliorivero eliorivero added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review This PR is ready for review. labels May 26, 2017
@zinigor zinigor merged commit 0ff8659 into master May 26, 2017
@zinigor zinigor deleted the fix/7179-grunion-ham-html branch May 26, 2017 20:27
@zinigor zinigor removed the [Status] Ready to Merge Go ahead, you can push that green button! label May 26, 2017
jeherve added a commit that referenced this pull request May 29, 2017
@jeherve
Changelog: add #7214
4054804
eliorivero pushed a commit that referenced this pull request May 30, 2017
@jeherve @eliorivero
Changelog: first pass at a changelog for 5.0 (#7116)
eee27f0 
* Changelog: first pass at a changelog for 5.0

* Changelog: delete 4.9 testing list.

* Changelog: update minimum WP version to match ver. in jetpack.php

Fixes #7158

* Changelog: add #6051

* Changelog: add #6753

* Changelog: add #6928

* Changelog: add #6964

* Changelog: add #7014

* Changelog: add #7057

* Changelog: add #7060

* Changelog: add #7068

* Changelog: add #7070

* Changelog: add #7072

* Changelog: add #7071

* Changelog: add release date and post shortlink.

* Changelog: add #7094

* Changelog: add #7100

* Changelog: add #7108

* Changelog: add #7113

* Changelog: add #7123

* Changelog: add #7135

* Changelog: add #7143

* Changelog: add #7151

* Changelog: add #6996

* Changelog: add #7105

* Changelog: add #7132

* Changelog: add #7166

* Changelog: fix typo in 4.9 changelog.

* Changelog: remove older releases' changelogs.

@see p1HpG7-42e-p2

* Changelog: add #7090

* Changelog: add #7095

* Changelog: add #7112

* Changelog: add #7115

* Changelog: add #7122

* Changelog: add #7137

* Changelog: add #7138

* Changelog: add #7140

* Changelog: add #7154

* Changelog: add ##7155

* Changelog: add #7163

* Changelog: add #7167

* Changelog: add #7171

* Changelog: add #7180

* Changelog: add #7181

* Changelog: add #7183

* Changelog: add #7184

* Changelog: add #7189

* Changelog: add #7191

* Changelog: add #7193

* Changelog: add #7198

* Changelog: add #7200

* Changelog: add #7209

* Changelog: add #7212

* Testing list: add instructions for #7115

* Changelog: add #7188

* Changelog: add #7205

* Changelog: add #7225

* Changelog: add #6872

* Changelog: add #7107

* Changelog: add #7118

* Changelog: add #7142

* Changelog: add #7170

* Changelog: add #7210

* Changelog: add #7218

* Changelog: add #7232

* Changelog: add #7211

* Changelog: add #7213

* Changelog: add #7229

* Changelog: add #7230

* Changelog: add #7214

* Draft changelog for 5.0

* Changelog updates: 2nd pass at a clearer changelog.

- Fix typos.
- Use consistent tense and tone across all changelog.
- Remove unclear items.

* Changelog: add #7026

* Changelog: add #7058

* Changelog: add #7125

* Changelog: add #7249

* Changelog: add #7185

* add mentions of image widget migration

* Changelog: add info about new output for CLI command.

* Changelog: add WP version number matching the new Image Widget.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@eliorivero eliorivero eliorivero approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Bug When a feature is broken and / or not performing as intended [Feature] Forms [Pri] High

Projects

None yet

Milestone

5.0

Development

Successfully merging this pull request may close these issues.

4 participants

@iandunn @eliorivero @zinigor @jeherve