From c5662ee7a168a60b30b1da365cdbc113d2eef84c Mon Sep 17 00:00:00 2001
From: hellofromTonya <hellofromTonya@git.wordpress.org>
Date: Fri, 5 Nov 2021 22:29:01 +0000
Subject: [PATCH] Bundled Theme: Add privacy policy link to Twenty Twenty
 footer.

If a privacy policy is set, its page is now linked in the footer.

Follow-up to [46271].

Props audrasjb, justinahinon, kapilpaul, ryelle, sabernhardt.
Fixes #53446.
Built from https://develop.svn.wordpress.org/trunk@52023


git-svn-id: http://core.svn.wordpress.org/trunk@51615 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentytwenty/footer.php    |  6 ++++++
 wp-content/themes/twentytwenty/style-rtl.css | 20 ++++++++++++++++++--
 wp-content/themes/twentytwenty/style.css     | 20 ++++++++++++++++++--
 wp-includes/version.php                      |  2 +-
 4 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/wp-content/themes/twentytwenty/footer.php b/wp-content/themes/twentytwenty/footer.php
index 65126eb269..fb3bc2f2c3 100644
--- a/wp-content/themes/twentytwenty/footer.php
+++ b/wp-content/themes/twentytwenty/footer.php
@@ -28,6 +28,12 @@
 							<a href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a>
 						</p><!-- .footer-copyright -->
 
+						<?php
+						if ( function_exists( 'the_privacy_policy_link' ) ) {
+							the_privacy_policy_link( '<p class="privacy-policy">', '</p>' );
+						}
+						?>
+
 						<p class="powered-by-wordpress">
 							<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentytwenty' ) ); ?>">
 								<?php _e( 'Powered by WordPress', 'twentytwenty' ); ?>
diff --git a/wp-content/themes/twentytwenty/style-rtl.css b/wp-content/themes/twentytwenty/style-rtl.css
index b0f35c5009..d412545acc 100644
--- a/wp-content/themes/twentytwenty/style-rtl.css
+++ b/wp-content/themes/twentytwenty/style-rtl.css
@@ -4464,15 +4464,22 @@ ul.footer-social li {
 }
 
 .footer-copyright a,
+.privacy-policy a,
 .powered-by-wordpress a {
 	color: inherit;
 }
 
+.privacy-policy,
 .powered-by-wordpress,
 .to-the-top {
 	color: #6d6d6d;
 }
 
+a.to-the-top {
+	margin-right: 2.4rem;
+	white-space: nowrap;
+}
+
 a.to-the-top > * {
 	pointer-events: none;
 }
@@ -4487,6 +4494,10 @@ a.to-the-top > * {
 	margin: 0 2.4rem 0 0;
 }
 
+.privacy-policy {
+	margin: 1.2rem 0 0;
+}
+
 .to-the-top-long {
 	display: none;
 }
@@ -5570,14 +5581,15 @@ a.to-the-top > * {
 
 	.footer-credits {
 		display: flex;
+		flex-wrap: wrap;
 	}
 
 	.footer-copyright {
 		font-weight: 700;
 	}
 
-	.powered-by-wordpress {
-		display: block;
+	.privacy-policy {
+		margin: 0 2.4rem 0 0;
 	}
 
 	.to-the-top-long {
@@ -6028,6 +6040,10 @@ a.to-the-top > * {
 	.footer-menu li {
 		margin: 1.2rem 2.4rem 0 0;
 	}
+
+	.powered-by-wordpress {
+		display: block;
+	}
 }
 
 
diff --git a/wp-content/themes/twentytwenty/style.css b/wp-content/themes/twentytwenty/style.css
index 380e7bd53e..80417f5b83 100644
--- a/wp-content/themes/twentytwenty/style.css
+++ b/wp-content/themes/twentytwenty/style.css
@@ -4498,15 +4498,22 @@ ul.footer-social li {
 }
 
 .footer-copyright a,
+.privacy-policy a,
 .powered-by-wordpress a {
 	color: inherit;
 }
 
+.privacy-policy,
 .powered-by-wordpress,
 .to-the-top {
 	color: #6d6d6d;
 }
 
+a.to-the-top {
+	margin-left: 2.4rem;
+	white-space: nowrap;
+}
+
 a.to-the-top > * {
 	pointer-events: none;
 }
@@ -4521,6 +4528,10 @@ a.to-the-top > * {
 	margin: 0 0 0 2.4rem;
 }
 
+.privacy-policy {
+	margin: 1.2rem 0 0;
+}
+
 .to-the-top-long {
 	display: none;
 }
@@ -5632,14 +5643,15 @@ a.to-the-top > * {
 
 	.footer-credits {
 		display: flex;
+		flex-wrap: wrap;
 	}
 
 	.footer-copyright {
 		font-weight: 700;
 	}
 
-	.powered-by-wordpress {
-		display: block;
+	.privacy-policy {
+		margin: 0 0 0 2.4rem;
 	}
 
 	.to-the-top-long {
@@ -6118,6 +6130,10 @@ a.to-the-top > * {
 	.footer-menu li {
 		margin: 1.2rem 0 0 2.4rem;
 	}
+
+	.powered-by-wordpress {
+		display: block;
+	}
 }
 
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0ebb683d2a..e4d320ee52 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.9-alpha-52022';
+$wp_version = '5.9-alpha-52023';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.