Ticket #44141: 44141.diff

src/wp-includes/comment.php

@@ -3440 +3440 @@
                 )
         );
 
+        /* translators: Name of a comment's author after being anonymized. */
         $anon_author = __( 'Anonymous' );
         $messages    = array();
 
@@ -3486 +3487 @@
                 $updated = $wpdb->update( $wpdb->comments, $anonymized_comment, $args );
 
                 if ( $updated ) {
+                        update_comment_meta( $comment_id, '_wp_anonymized', true );
                         $items_removed = true;
                         clean_comment_cache( $comment_id );
                 } else {

src/wp-includes/functions.php

@@ -6212 +6212 @@
 function wp_privacy_anonymize_data( $type, $data = '' ) {
 
         switch ( $type ) {
-                case 'email':
-                        $anonymous = 'deleted@site.invalid';
-                        break;
-                case 'url':
-                        $anonymous = 'https://site.invalid';
-                        break;
                 case 'ip':
                         $anonymous = wp_privacy_anonymize_ip( $data );
                         break;

tests/phpunit/tests/comment.php

@@ -815 +815 @@
         /**
          * The `wp_comments_personal_data_eraser()` function should erase user's comments.
          *
+         * @group privacy
          * @ticket 43442
          */
         public function test_wp_comments_personal_data_eraser() {
@@ -856 +857 @@
                         'comment_ID'           => (string) $comment_id,
                         'user_id'              => '0', // Anonymized.
                         'comment_author'       => 'Anonymous', // Anonymized.
-                        'comment_author_email' => 'deleted@site.invalid', // Anonymized.
-                        'comment_author_url'   => 'https://site.invalid', // Anonymized.
+                        'comment_author_email' => '', // Anonymized.
+                        'comment_author_url'   => '', // Anonymized.
                         'comment_author_IP'    => '192.168.0.0', // Anonymized.
                         'comment_date'         => '2018-04-14 17:20:00',
                         'comment_date_gmt'     => '2018-04-14 17:20:00',
@@ -866 +867 @@
                 );
 
                 $this->assertSame( $expected, $actual );
+                // Ensure the comment was marked as anonymized in meta.
+                $this->assertSame( '1', get_comment_meta( $comment_id, '_wp_anonymized', true ) );
         }
 
         /**
          * Testing the `wp_comments_personal_data_eraser()` function's output on an empty first page.
          *
+         * @group privacy
          * @ticket 43442
          */
         public function test_wp_comments_personal_data_eraser_empty_first_page_output() {
@@ -889 +893 @@
         /**
          * Testing the `wp_comments_personal_data_eraser()` function's output, for the non-empty first page.
          *
+         * @group privacy
          * @ticket 43442
          */
         public function test_wp_comments_personal_data_eraser_non_empty_first_page_output() {
@@ -920 +925 @@
         /**
          * Testing the `wp_comments_personal_data_eraser()` function's output, for an empty second page.
          *
+         * @group privacy
          * @ticket 43442
          */
         public function test_wp_comments_personal_data_eraser_empty_second_page_output() {
@@ -951 +957 @@
         /**
          * Testing the `wp_anonymize_comment` filter, to prevent comment anonymization.
          *
+         * @group privacy
          * @ticket 43442
          */
         public function test_wp_anonymize_comment_filter_to_prevent_comment_anonymization() {
@@ -987 +994 @@
         /**
          * Testing the `wp_anonymize_comment` filter, to prevent comment anonymization, with a custom message.
          *
+         * @group privacy
          * @ticket 43442
          */
         public function test_wp_anonymize_comment_filter_to_prevent_comment_anonymization_with_custom_message() {

tests/phpunit/tests/functions/anonymization.php

@@ -212 +212 @@
          * Test email anonymization of `wp_privacy_anonymize_data()`.
          */
         public function test_anonymize_email() {
-                $this->assertEquals( 'deleted@site.invalid', wp_privacy_anonymize_data( 'email', 'bar@example.com' ) );
+                $this->assertEquals( '', wp_privacy_anonymize_data( 'email', 'bar@example.com' ) );
         }
 
         /**
@@ -219 +219 @@
          * Test url anonymization of `wp_privacy_anonymize_data()`.
          */
         public function test_anonymize_url() {
-                $this->assertEquals( 'https://site.invalid', wp_privacy_anonymize_data( 'url', 'https://example.com/author/username' ) );
+                $this->assertEquals( '', wp_privacy_anonymize_data( 'url', 'https://example.com/author/username' ) );
         }
 
         /**
@@ -244 +244 @@
                 $text = __( 'Four score and seven years ago' );
                 $this->assertEquals( 'This content was deleted by the author.', wp_privacy_anonymize_data( 'longtext', $text ) );
         }
+
+        /**
+         * Test text anonymization when a filter is added.
+         *
+         * @ticket 44141
+         */
+        public function test_anonymize_with_filter() {
+                add_filter( 'wp_privacy_anonymize_data', array( $this, 'filter_wp_privacy_anonymize_data' ), 10, 3 );
+                $this->assertEquals( '', wp_privacy_anonymize_data( 'email', 'bar@example.com' ) );
+                $this->assertEquals( 'http://local.host/why-this-was-removed', wp_privacy_anonymize_data( 'url', 'https://example.com/author/username' ) );
+                remove_all_filters( 'wp_privacy_anonymize_data' );
+        }
+
+        /**
+         * Change the anonymized value for URLs.
+         *
+         * @param string $anonymous Anonymized data.
+         * @param string $type      Type of the data.
+         * @param string $data      Original data.
+         * @return string Anonymized data.
+         */
+        public function filter_wp_privacy_anonymize_data( $anonymous, $type, $data ) {
+                if ( 'url' === $type ) {
+                        return 'http://local.host/why-this-was-removed';
+                }
+
+                return $anonymous;
+        }
 }