Ticket #46536: 46536.2.diff

src/wp-includes/user.php

@@ -3587 +3587 @@
         }
 
         if ( ! $action_name ) {
+                return new WP_Error( 'missing_action', __( 'Missing action name.' ) );
+        }
+
+        if ( ! in_array( $action_name, _wp_privacy_action_request_types(), true ) ) {
                 return new WP_Error( 'invalid_action', __( 'Invalid action name.' ) );
         }
 

tests/phpunit/tests/privacy/wpCreateUserRequest.php

@@ -93 +93 @@
         }
 
         /**
+         * Ensure a WP_Error is returned when no action is passed.
+         *
+         * @ticket 46536
+         */
+        public function test_missing_action() {
+                $actual = wp_create_user_request( self::$registered_user_email, false );
+
+                $this->assertWPError( $actual );
+                $this->assertSame( 'missing_action', $actual->get_error_code() );
+        }
+
+        /**
          * Ensure a WP_Error is returned when an invalid action is passed.
          *
-         * @ticket 44707
+         * @ticket 46536
          */
         public function test_invalid_action() {
-                $actual = wp_create_user_request( self::$registered_user_email, false );
+                $actual = wp_create_user_request( self::$registered_user_email, 'invalid_action_name' );
 
                 $this->assertWPError( $actual );
                 $this->assertSame( 'invalid_action', $actual->get_error_code() );
@@ -161 +173 @@
          * @ticket 44707
          */
         public function test_sanitized_action_name() {
-                $actual = wp_create_user_request( self::$non_registered_user_email, 'some[custom*action\name' );
+                $actual = wp_create_user_request( self::$non_registered_user_email, 'export[_person*al_\data' );
 
                 $this->assertNotWPError( $actual );
 
                 $post = get_post( $actual );
 
-                $this->assertSame( 'somecustomactionname', $post->post_name );
+                $this->assertSame( 'export_personal_data', $post->post_name );
                 $this->assertSame( self::$non_registered_user_email, $post->post_title );
         }
 

tests/phpunit/tests/user/wpSendUserRequest.php

@@ -374 +374 @@
                 update_user_meta( self::$admin_user->ID, 'locale', 'es_ES' );
                 wp_set_current_user( self::$admin_user->ID );
 
-                $request_id = wp_create_user_request( 'erase-user-not-registered@example.com', 'erase_personal_data' );
+                $request_id = wp_create_user_request( 'erase-user-not-registered@example.com', 'remove_personal_data' );
 
                 wp_send_user_request( $request_id );
                 $mailer = tests_retrieve_phpmailer_instance();
@@ -396 +396 @@
                 update_user_meta( self::$admin_user->ID, 'locale', 'de_DE' );
                 wp_set_current_user( self::$admin_user->ID );
 
-                $request_id = wp_create_user_request( 'export-user-not-registered@example.com', 'erase_personal_data' );
+                $request_id = wp_create_user_request( 'export-user-not-registered@example.com', 'remove_personal_data' );
 
                 wp_send_user_request( $request_id );
                 $mailer = tests_retrieve_phpmailer_instance();