Ticket #49476: 49476.diff

src/wp-admin/tools.php

@@ -18 +18 @@
         }
 }
 
-/** WordPress Administration Bootstrap */
-require_once __DIR__ . '/admin.php';
-
 // The privacy policy guide used to be outputted from here. Since WP 5.3 it is in wp-admin/privacy-policy-guide.php.
 if ( isset( $_GET['wp-privacy-policy-guide'] ) ) {
+        require_once dirname(__DIR__) . '/wp-load.php';
         wp_redirect( admin_url( 'privacy-policy-guide.php' ), 301 );
         exit;
 } elseif ( isset( $_GET['page'] ) ) {
         // These were also moved to files in WP 5.3.
         if ( 'export_personal_data' === $_GET['page'] ) {
+                require_once dirname(__DIR__) . '/wp-load.php';
                 wp_redirect( admin_url( 'export-personal-data.php' ), 301 );
                 exit;
         } elseif ( 'remove_personal_data' === $_GET['page'] ) {
+                require_once dirname(__DIR__) . '/wp-load.php';
                 wp_redirect( admin_url( 'erase-personal-data.php' ), 301 );
                 exit;
         }
 }
 
+/** WordPress Administration Bootstrap */
+require_once __DIR__ . '/admin.php';
+
 $title = __( 'Tools' );
 
 get_current_screen()->add_help_tab(

src/wp-includes/user.php

@@ -3184 +3184 @@
                 return;
         }
 
-        $manage_url         = add_query_arg( 'page', $request->action_name, admin_url( 'tools.php' ) );
+        if ( 'export_personal_data' === $request->action_name ) {
+                $manage_url = admin_url( 'export-personal-data.php' );
+        } elseif ( 'remove_personal_data' === $request->action_name ) {
+                $manage_url = admin_url( 'erase-personal-data.php' );
+        }
         $action_description = wp_user_request_action_description( $request->action_name );
 
         /**