From f48ed236ff62c11344127d5ccc9012b99ddf5e87 Mon Sep 17 00:00:00 2001
From: James Nylen <jnylen@gmail.com>
Date: Wed, 19 Jul 2017 21:42:42 +0000
Subject: [PATCH] About page: Add a privacy policy.

Props MattyRob, johnbillion, swissspidy.
Fixes #40794.

Built from https://develop.svn.wordpress.org/trunk@41096


git-svn-id: http://core.svn.wordpress.org/trunk@40936 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/about.php      |  1 +
 wp-admin/credits.php    |  1 +
 wp-admin/freedoms.php   |  1 +
 wp-admin/privacy.php    | 40 ++++++++++++++++++++++++++++++++++++++++
 wp-includes/version.php |  2 +-
 5 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 wp-admin/privacy.php

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 47524fc0b1..6dab78831d 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -41,6 +41,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			<a href="about.php" class="nav-tab nav-tab-active"><?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"><?php _e( 'Privacy' ); ?></a>
 		</h2>
 
 		<div class="feature-section one-col">
diff --git a/wp-admin/credits.php b/wp-admin/credits.php
index 741fa08f6c..fd273e0e99 100644
--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -28,6 +28,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 	<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
 	<a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
 	<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+	<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
 </h2>
 
 <?php
diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php
index 963ba5c1fe..4ab042332a 100644
--- a/wp-admin/freedoms.php
+++ b/wp-admin/freedoms.php
@@ -27,6 +27,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 	<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 nav-tab-active"><?php _e( 'Freedoms' ); ?></a>
+	<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
 </h2>
 
 <p class="about-description"><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'https://wordpress.org/about/license/' ); ?></p>
diff --git a/wp-admin/privacy.php b/wp-admin/privacy.php
new file mode 100644
index 0000000000..d9c34112e9
--- /dev/null
+++ b/wp-admin/privacy.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Privacy administration panel.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */
+require_once( dirname( __FILE__ ) . '/admin.php' );
+
+$title = __( 'Privacy' );
+
+list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
+
+include( ABSPATH . 'wp-admin/admin-header.php' );
+?>
+<div class="wrap about-wrap">
+
+<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
+
+<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s helps you get your site set up the way you want it.' ), $display_version ); ?></p>
+
+<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
+
+<h2 class="nav-tab-wrapper wp-clearfix">
+	<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"><?php _e( 'Privacy' ); ?></a>
+</h2>
+
+<p class="about-description"><?php _e( 'Your WordPress site may send anonymous data including, but not limited to, the list of installed plugins and themes to WordPress.org when requesting updates.' ); ?></p>
+
+<p><?php _e( ' This data helps WordPress to protect your site by finding and automatically installing new updates. None of the information shared with the update server contains personally identifiable information.' ); ?></p>
+
+<p><?php printf( __( 'We take privacy seriously. Learn more at <a href="%s">wordpress.org/privacy</a>.' ), __( 'https://wordpress.org/about/privacy/' ) ); ?></p>
+
+</div>
+<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 642a0ab9f5..78b4142c9b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-41094';
+$wp_version = '4.9-alpha-41096';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.