Changeset 47417

Timestamp:

03/03/2020 05:07:46 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Fix the URLs and legacy redirects for the personal data export and erasure screens.

Props Jurgen Oldenburg, garrett-eclipse.
Merges [47412] to the 5.3 branch.
Fixes #49476.

Location:

branches/5.3

Files:

• . (modified) (1 prop)
• src/wp-admin/tools.php (modified) (2 diffs)
• src/wp-includes/user.php (modified) (1 diff)

branches/5.3/src/wp-admin/tools.php

@@ -19 +19 @@
 }
 
-/** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/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;
@@ -29 +27 @@
     // These were also moved to files in WP 5.3.
     if ( $_GET['page'] === 'export_personal_data' ) {
+        require_once dirname( __DIR__ ) . '/wp-load.php';
         wp_redirect( admin_url( 'export-personal-data.php' ), 301 );
         exit;
     } elseif ( $_GET['page'] === 'remove_personal_data' ) {
+        require_once dirname( __DIR__ ) . '/wp-load.php';
         wp_redirect( admin_url( 'erase-personal-data.php' ), 301 );
         exit;
     }
 }
+
+/** WordPress Administration Bootstrap */
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 $title = __( 'Tools' );

branches/5.3/src/wp-includes/user.php

@@ -3064 +3064 @@
     }
 
-    $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 );