From 242e6eea46728cad56818e1c73cf0aedc5474b49 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Mon, 14 May 2018 16:46:23 +0000
Subject: [PATCH] Privacy: fix markup for the table of contents on privacy
 policy guide screen.

Props ocean90, azaozz.
Fixes #44056.
Built from https://develop.svn.wordpress.org/trunk@43265


git-svn-id: http://core.svn.wordpress.org/trunk@43094 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/misc.php | 8 +++++---
 wp-includes/version.php    | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index 1145bb87af..89af5a7849 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -1609,8 +1609,8 @@ final class WP_Privacy_Policy_Content {
 		$content_array = self::get_suggested_policy_text();
 
 		$content = '';
-		$toc = array( '<li><a href="#">' . __( 'Introduction' ) . '</a></li>' );
-		$date_format = get_option( 'date_format' );
+		$toc = array( '<li><a href="#wp-privacy-policy-guide-introduction">' . __( 'Introduction' ) . '</a></li>' );
+		$date_format = __( 'F j, Y' );
 		$copy = __( 'Copy' );
 		$return_to_top = '<a href="#" class="return-to-top">' . __( '&uarr; Return to Top' ) . '</a>';
 
@@ -1635,11 +1635,12 @@ final class WP_Privacy_Policy_Content {
 			}
 
 			$plugin_name = esc_html( $section['plugin_name'] );
-			$toc_id = sanitize_title( $plugin_name );
+			$toc_id = 'wp-privacy-policy-guide-' . sanitize_title( $plugin_name );
 			$toc[] = sprintf( '<li><a href="#%1$s">%2$s</a>' . $meta . '</li>', $toc_id, $plugin_name );
 
 			$content .= '<div class="privacy-text-section' . $class . '">';
 			$content .= '<a id="' . $toc_id . '">&nbsp;</a>';
+			/* translators: %s: plugin name */
 			$content .= '<h2>' . sprintf( __( 'Source: %s' ), $plugin_name ) . '</h2>';
 			$content .= $removed;
 
@@ -1672,6 +1673,7 @@ final class WP_Privacy_Policy_Content {
 		?>
 		<div class="privacy-text-box">
 			<div class="privacy-text-box-head">
+				<a id="wp-privacy-policy-guide-introduction">&nbsp;</a>
 				<h2><?php _e( 'Introduction' ); ?></h2>
 				<p><?php _e( 'Hello,' ); ?></p>
 				<p><?php _e( 'This text template will help you to create your web site&#8217;s privacy policy.' ); ?></p>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e1f8301cc5..2cc46115a3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-43263';
+$wp_version = '5.0-alpha-43265';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.