diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-admin/privacy.php
--- a/wp/wp-admin/privacy.php	Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-admin/privacy.php	Tue Dec 15 13:49:49 2020 +0100
@@ -1,263 +1,69 @@
 <?php
 /**
- * Privacy Settings Screen.
+ * Privacy administration panel.
  *
  * @package WordPress
  * @subpackage Administration
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-
-if ( ! current_user_can( 'manage_privacy_options' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to manage privacy on this site.' ) );
-}
-
-$action = isset( $_POST['action'] ) ? $_POST['action'] : '';
-
-if ( ! empty( $action ) ) {
-	check_admin_referer( $action );
-
-	if ( 'set-privacy-page' === $action ) {
-		$privacy_policy_page_id = isset( $_POST['page_for_privacy_policy'] ) ? (int) $_POST['page_for_privacy_policy'] : 0;
-		update_option( 'wp_page_for_privacy_policy', $privacy_policy_page_id );
-
-		$privacy_page_updated_message = __( 'Privacy Policy page updated successfully.' );
+require_once __DIR__ . '/admin.php';
 
-		if ( $privacy_policy_page_id ) {
-			/*
-			 * Don't always link to the menu customizer:
-			 *
-			 * - Unpublished pages can't be selected by default.
-			 * - `WP_Customize_Nav_Menus::__construct()` checks the user's capabilities.
-			 * - Themes might not "officially" support menus.
-			 */
-			if (
-				'publish' === get_post_status( $privacy_policy_page_id )
-				&& current_user_can( 'edit_theme_options' )
-				&& current_theme_supports( 'menus' )
-			) {
-				$privacy_page_updated_message = sprintf(
-					/* translators: %s: URL to Customizer -> Menus */
-					__( 'Privacy Policy page setting updated successfully. Remember to <a href="%s">update your menus</a>!' ),
-					esc_url( add_query_arg( 'autofocus[panel]', 'nav_menus', admin_url( 'customize.php' ) ) )
-				);
-			}
-		}
-
-		add_settings_error(
-			'page_for_privacy_policy',
-			'page_for_privacy_policy',
-			$privacy_page_updated_message,
-			'updated'
-		);
-	} elseif ( 'create-privacy-page' === $action ) {
-
-		if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/misc.php' );
-		}
+$title = __( 'Privacy' );
 
-		$privacy_policy_page_content = WP_Privacy_Policy_Content::get_default_content();
-		$privacy_policy_page_id      = wp_insert_post(
-			array(
-				'post_title'   => __( 'Privacy Policy' ),
-				'post_status'  => 'draft',
-				'post_type'    => 'page',
-				'post_content' => $privacy_policy_page_content,
-			),
-			true
-		);
-
-		if ( is_wp_error( $privacy_policy_page_id ) ) {
-			add_settings_error(
-				'page_for_privacy_policy',
-				'page_for_privacy_policy',
-				__( 'Unable to create a Privacy Policy page.' ),
-				'error'
-			);
-		} else {
-			update_option( 'wp_page_for_privacy_policy', $privacy_policy_page_id );
-
-			wp_redirect( admin_url( 'post.php?post=' . $privacy_policy_page_id . '&action=edit' ) );
-			exit;
-		}
-	}
-}
-
-// If a Privacy Policy page ID is available, make sure the page actually exists. If not, display an error.
-$privacy_policy_page_exists = false;
-$privacy_policy_page_id     = (int) get_option( 'wp_page_for_privacy_policy' );
-
-if ( ! empty( $privacy_policy_page_id ) ) {
+list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
 
-	$privacy_policy_page = get_post( $privacy_policy_page_id );
-
-	if ( ! $privacy_policy_page instanceof WP_Post ) {
-		add_settings_error(
-			'page_for_privacy_policy',
-			'page_for_privacy_policy',
-			__( 'The currently selected Privacy Policy page does not exist. Please create or select a new page.' ),
-			'error'
-		);
-	} else {
-		if ( 'trash' === $privacy_policy_page->post_status ) {
-			add_settings_error(
-				'page_for_privacy_policy',
-				'page_for_privacy_policy',
-				sprintf(
-					/* translators: URL to Pages Trash */
-					__( 'The currently selected Privacy Policy page is in the trash. Please create or select a new Privacy Policy page or <a href="%s">restore the current page</a>.' ),
-					'edit.php?post_status=trash&post_type=page'
-				),
-				'error'
-			);
-		} else {
-			$privacy_policy_page_exists = true;
-		}
-	}
-}
-
-$title       = __( 'Privacy Settings' );
-$parent_file = 'options-general.php';
-
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
-
+require_once ABSPATH . 'wp-admin/admin-header.php';
 ?>
-<div class="wrap">
-	<h1><?php echo $title; ?></h1>
-	<h2><?php _e( 'Privacy Policy page' ); ?></h2>
-	<p>
-		<?php _e( 'As a website owner, you may need to follow national or international privacy laws. For example, you may need to create and display a Privacy Policy.' ); ?>
-		<?php _e( 'If you already have a Privacy Policy page, please select it below. If not, please create one.' ); ?>
-	</p>
-	<p>
-		<?php _e( 'The new page will include help and suggestions for your Privacy Policy.' ); ?>
-		<?php _e( 'However, it is your responsibility to use those resources correctly, to provide the information that your Privacy Policy requires, and to keep that information current and accurate.' ); ?>
-	</p>
-	<p>
-		<?php _e( 'After your Privacy Policy page is set, we suggest that you edit it.' ); ?>
-		<?php _e( 'We would also suggest reviewing your Privacy Policy from time to time, especially after installing or updating any themes or plugins. There may be changes or new suggested information for you to consider adding to your policy.' ); ?>
-	</p>
-	<?php
+<div class="wrap about__container">
 
-	if ( $privacy_policy_page_exists ) {
-		$edit_href = add_query_arg(
-			array(
-				'post'   => $privacy_policy_page_id,
-				'action' => 'edit',
-			),
-			admin_url( 'post.php' )
-		);
-
-		$view_href = get_permalink( $privacy_policy_page_id );
-
-		?>
-		<p class="tools-privacy-edit"><strong>
-			<?php
+	<div class="about__header">
+		<div class="about__header-text">
+			<?php _e( 'Speed. Search. Security.' ); ?>
+		</div>
 
-			if ( 'publish' === get_post_status( $privacy_policy_page_id ) ) {
-				printf(
-					/* translators: 1: URL to edit Privacy Policy page, 2: URL to view Privacy Policy page */
-					__( '<a href="%1$s">Edit</a> or <a href="%2$s">view</a> your Privacy Policy page content.' ),
-					esc_url( $edit_href ),
-					esc_url( $view_href )
-				);
-			} else {
-				printf(
-					/* translators: 1: URL to edit Privacy Policy page, 2: URL to preview Privacy Policy page */
-					__( '<a href="%1$s">Edit</a> or <a href="%2$s">preview</a> your Privacy Policy page content.' ),
-					esc_url( $edit_href ),
-					esc_url( $view_href )
-				);
-			}
+		<div class="about__header-title">
+			<p>
+				<?php _e( 'WordPress' ); ?>
+				<span><?php echo $display_version; ?></span>
+			</p>
+		</div>
 
-			?>
-		</strong></p>
-		<?php
-	}
-	?>
-	<p>
-		<?php
+		<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
+			<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
+			<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
+			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+			<a href="privacy.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Privacy' ); ?></a>
+		</nav>
+	</div>
 
-		printf(
-			/* translators: 1: Privacy Policy guide URL, 2: additional link attributes, 3: accessibility text */
-			__( 'Need help putting together your new Privacy Policy page? <a href="%1$s" %2$s>Check out our guide%3$s</a> for recommendations on what content to include, along with policies suggested by your plugins and theme.' ),
-			esc_url( admin_url( 'tools.php?wp-privacy-policy-guide=1' ) ),
-			'',
-			''
-		);
-
-		?>
-	</p>
+	<div class="about__section">
+		<div class="column">
+			<h1><?php _e( 'Privacy' ); ?></h1>
 
-	<hr>
-	<table class="form-table tools-privacy-policy-page" role="presentation">
-		<tr>
-			<th scope="row"><label for="page_for_privacy_policy">
+			<p><?php _e( 'From time to time, your WordPress site may send data to WordPress.org &#8212; including, but not limited to &#8212; the version of WordPress you are using, and a list of installed plugins and themes.' ); ?></p>
+
+			<p>
 				<?php
-				if ( $privacy_policy_page_exists ) {
-					_e( 'Change your Privacy Policy page' );
-				} else {
-					_e( 'Select a Privacy Policy page' );
-				}
+				printf(
+					/* translators: %s: https://wordpress.org/about/stats/ */
+					__( 'This data is used to provide general enhancements to WordPress, which includes helping to protect your site by finding and automatically installing new updates. It is also used to calculate statistics, such as those shown on the <a href="%s">WordPress.org stats page</a>.' ),
+					__( 'https://wordpress.org/about/stats/' )
+				);
 				?>
-			</label></th>
-			<td>
-				<?php
-				$has_pages = (bool) get_posts(
-					array(
-						'post_type'      => 'page',
-						'posts_per_page' => 1,
-						'post_status'    => array(
-							'publish',
-							'draft',
-						),
-					)
-				);
+			</p>
 
-				if ( $has_pages ) :
-					?>
-					<form method="post" action="">
-						<input type="hidden" name="action" value="set-privacy-page" />
-						<?php
-						wp_dropdown_pages(
-							array(
-								'name'              => 'page_for_privacy_policy',
-								'show_option_none'  => __( '&mdash; Select &mdash;' ),
-								'option_none_value' => '0',
-								'selected'          => $privacy_policy_page_id,
-								'post_status'       => array( 'draft', 'publish' ),
-							)
-						);
-
-						wp_nonce_field( 'set-privacy-page' );
-
-						submit_button( __( 'Use This Page' ), 'primary', 'submit', false, array( 'id' => 'set-page' ) );
-						?>
-					</form>
-				<?php endif; ?>
+			<p>
+				<?php
+				printf(
+					/* translators: %s: https://wordpress.org/about/privacy/ */
+					__( 'We take privacy and transparency very seriously. To learn more about what data we collect, and how we use it, please visit <a href="%s">WordPress.org/about/privacy</a>.' ),
+					__( 'https://wordpress.org/about/privacy/' )
+				);
+				?>
+			</p>
+		</div>
+	</div>
 
-				<form class="wp-create-privacy-page" method="post" action="">
-					<input type="hidden" name="action" value="create-privacy-page" />
-					<span>
-						<?php
-						if ( $has_pages ) {
-							_e( 'Or:' );
-						} else {
-							_e( 'There are no pages.' );
-						}
-						?>
-					</span>
-					<?php
-					wp_nonce_field( 'create-privacy-page' );
-
-					submit_button( __( 'Create New Page' ), 'primary', 'submit', false, array( 'id' => 'create-page' ) );
-					?>
-				</form>
-			</td>
-		</tr>
-	</table>
 </div>
-<?php
-
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+<?php require_once ABSPATH . 'wp-admin/admin-footer.php'; ?>