From cc7370b2af7586de71958d98e45c4ed21ccabe5f Mon Sep 17 00:00:00 2001
From: joedolson <joedolson@git.wordpress.org>
Date: Wed, 17 Apr 2024 20:21:15 +0000
Subject: [PATCH] Help/About: Accessibility: Remove `target="_blank"` from data
 eraser links.

Remove `target="_blank"` from two links to developer resources on adding the personal data eraser to plugins in the Help info for the privacy screens. Also rectifies differences between the export and erase text for consistency and changes the order of paragraphs.

Props sabernhardt, joedolson.
Fixes #60097.
Built from https://develop.svn.wordpress.org/trunk@58021


git-svn-id: http://core.svn.wordpress.org/trunk@57487 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/erase-personal-data.php  | 4 ++--
 wp-admin/export-personal-data.php | 4 ++--
 wp-includes/version.php           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-admin/erase-personal-data.php b/wp-admin/erase-personal-data.php
index 9a17c2b346..c96d80a9b5 100644
--- a/wp-admin/erase-personal-data.php
+++ b/wp-admin/erase-personal-data.php
@@ -55,8 +55,8 @@ get_current_screen()->add_help_tab(
 		'title'   => __( 'Plugin Data' ),
 		'content' =>
 					'<p>' . __( 'Many plugins may collect or store personal data either in the WordPress database or remotely. Any Erase Personal Data request should delete data from plugins as well.' ) . '</p>' .
-					'<p>' . __( 'If you are a plugin author, you can <a href="https://developer.wordpress.org/plugins/privacy/adding-the-personal-data-eraser-to-your-plugin/" target="_blank">learn more about how to add support for the Personal Data Eraser to a plugin here</a>.' ) . '</p>' .
-					$privacy_policy_guide,
+					$privacy_policy_guide .
+					'<p>' . __( 'If you are a plugin author, you can learn more about <a href="https://developer.wordpress.org/plugins/privacy/adding-the-personal-data-eraser-to-your-plugin/">how to add the Personal Data Eraser to a plugin</a>.' ) . '</p>',
 	)
 );
 
diff --git a/wp-admin/export-personal-data.php b/wp-admin/export-personal-data.php
index 2eedd90aa3..64b9653c3c 100644
--- a/wp-admin/export-personal-data.php
+++ b/wp-admin/export-personal-data.php
@@ -55,8 +55,8 @@ get_current_screen()->add_help_tab(
 		'title'   => __( 'Plugin Data' ),
 		'content' =>
 					'<p>' . __( 'Many plugins may collect or store personal data either in the WordPress database or remotely. Any Export Personal Data request should include data from plugins as well.' ) . '</p>' .
-					'<p>' . __( 'Plugin authors can <a href="https://developer.wordpress.org/plugins/privacy/adding-the-personal-data-exporter-to-your-plugin/" target="_blank">learn more about how to add the Personal Data Exporter to a plugin here</a>.' ) . '</p>' .
-					$privacy_policy_guide,
+					$privacy_policy_guide .
+					'<p>' . __( 'If you are a plugin author, you can learn more about <a href="https://developer.wordpress.org/plugins/privacy/adding-the-personal-data-exporter-to-your-plugin/">how to add the Personal Data Exporter to a plugin</a>.' ) . '</p>',
 	)
 );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5eaec755bf..5a64e4d883 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.6-alpha-58017';
+$wp_version = '6.6-alpha-58021';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.