vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 12:20:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Privacy: Improve naming of user confimed action email filters.

Browse Source 
The filters `user_confirmed_action_email_content`, `user_erasure_complete_email_subject`, and `user_erasure_complete_email_headers` have been deprecated.

They have been replaced with `user_erasure_fulfillment_email_content`, `user_erasure_fulfillment_email_subject`, and `user_erasure_fulfillment_email_headers`.

Props desrosj, garrett-eclipse, birgire, DrewAPicture, lifeforceinst, ocean90, pbiron, pento, coffee2code, TZ-Media, SergeyBiryukov, johnbillion, audrasjb, davidbaumwald, hellofromTonya, helen, xkon, antpb, peterwilsoncc, lukecarbis.
Fixes #44314.



git-svn-id: https://develop.svn.wordpress.org/trunk@51129 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Anthony Burchell
2021-06-09 01:34:09 +00:00
parent a2969fb07f
commit 1c418298bf
4 changed files with 246 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/phpunit/tests/privacy/wpPrivacySendErasureFulfillmentNotification.php
+3 -3
View File
@@ -210,7 +210,7 @@ class Tests_Privacy_wpPrivacySendErasureFulfillmentNotification extends WP_UnitT
* @ticket 44234
*/
public function test_email_subject_should_be_filterable() {
add_filter( 'user_erasure_complete_email_subject', array( $this, 'filter_email_subject' ) );
add_filter( 'user_erasure_fulfillment_email_subject', array( $this, 'filter_email_subject' ) );
_wp_privacy_send_erasure_fulfillment_notification( self::$request_id );
$mailer = tests_retrieve_phpmailer_instance();
@@ -236,7 +236,7 @@ class Tests_Privacy_wpPrivacySendErasureFulfillmentNotification extends WP_UnitT
* @ticket 44234
*/
public function test_email_body_text_should_be_filterable() {
add_filter( 'user_confirmed_action_email_content', array( $this, 'filter_email_body_text' ) );
add_filter( 'user_erasure_fulfillment_email_content', array( $this, 'filter_email_body_text' ) );
_wp_privacy_send_erasure_fulfillment_notification( self::$request_id );
$mailer = tests_retrieve_phpmailer_instance();
@@ -264,7 +264,7 @@ class Tests_Privacy_wpPrivacySendErasureFulfillmentNotification extends WP_UnitT
* @ticket 44501
*/
public function test_email_headers_should_be_filterable() {
add_filter( 'user_erasure_complete_email_headers', array( $this, 'modify_email_headers' ) );
add_filter( 'user_erasure_fulfillment_email_headers', array( $this, 'modify_email_headers' ) );
_wp_privacy_send_erasure_fulfillment_notification( self::$request_id );
$mailer = tests_retrieve_phpmailer_instance();
tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php
+2 -2
View File
@@ -178,9 +178,9 @@ class Tests_Privacy_wpPrivacySendRequestConfirmationNotification extends WP_Unit
_wp_privacy_account_request_confirmed( $request_id );
add_filter( 'user_confirmed_action_email_content', array( $this, 'modify_email_content' ), 10, 2 );
add_filter( 'user_request_confirmed_email_content', array( $this, 'modify_email_content' ), 10, 2 );
_wp_privacy_send_request_confirmation_notification( $request_id );
remove_filter( 'user_confirmed_action_email_content', array( $this, 'modify_email_content' ), 10 );
remove_filter( 'user_request_confirmed_email_content', array( $this, 'modify_email_content' ), 10 );
$mailer = tests_retrieve_phpmailer_instance();
$this->assertContains( 'Custom content containing email address:' . $email, $mailer->get_sent()->body );