From b4290211f4e8227bf6eaa35d9eb0af5e7740c4a1 Mon Sep 17 00:00:00 2001
From: iandunn <iandunn@git.wordpress.org>
Date: Tue, 1 May 2018 06:28:21 +0000
Subject: [PATCH] Bundled Themes: Add link to privacy policy page in footer.

If a privacy policy has been set, then a link to it will automatically be shown in the footer.

The element containing the "Proudly powered by WordPress" link was chosen for the new policy link, in order to minimize visual conflicts with custom CSS that was written before the new link existed. Unfortunately, some minor conflicts are expected and unavoidable. Adding this link is required as part of GDPR compliance, and the benefits outweigh the downsides.

To further mitigate the conflicts, a new `imprint` class was added to the "Proudly powered..." link, in order to facilitate targeting each link invididually with custom styles.

Props xkon, laurelfulford, birgire, azaozz, iandunn.
See #43715.

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


git-svn-id: http://core.svn.wordpress.org/trunk@42880 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyeleven/footer.php           |  9 ++++++++-
 wp-content/themes/twentyeleven/style.css            |  6 ++++++
 wp-content/themes/twentyfifteen/footer.php          |  9 ++++++++-
 wp-content/themes/twentyfifteen/style.css           |  7 +++++++
 wp-content/themes/twentyfourteen/footer.php         |  9 ++++++++-
 wp-content/themes/twentyfourteen/rtl.css            | 10 +++++++++-
 wp-content/themes/twentyfourteen/style.css          |  7 +++++++
 wp-content/themes/twentyseventeen/style.css         |  8 ++++++++
 .../template-parts/footer/site-info.php             |  9 ++++++++-
 wp-content/themes/twentysixteen/footer.php          |  9 ++++++++-
 wp-content/themes/twentysixteen/rtl.css             | 13 ++-----------
 wp-content/themes/twentysixteen/style.css           | 10 ++++++++++
 wp-content/themes/twentyten/footer.php              |  9 ++++++++-
 wp-content/themes/twentyten/style.css               |  6 ++++++
 wp-content/themes/twentythirteen/footer.php         |  9 ++++++++-
 wp-content/themes/twentythirteen/rtl.css            |  5 ++++-
 wp-content/themes/twentythirteen/style.css          |  7 +++++++
 wp-content/themes/twentytwelve/footer.php           |  9 ++++++++-
 wp-content/themes/twentytwelve/style.css            |  6 ++++++
 wp-includes/version.php                             |  2 +-
 20 files changed, 137 insertions(+), 22 deletions(-)

diff --git a/wp-content/themes/twentyeleven/footer.php b/wp-content/themes/twentyeleven/footer.php
index b14ba70a24..53fa696ee4 100644
--- a/wp-content/themes/twentyeleven/footer.php
+++ b/wp-content/themes/twentyeleven/footer.php
@@ -26,7 +26,14 @@
 
 			<div id="site-generator">
 				<?php do_action( 'twentyeleven_credits' ); ?>
-				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyeleven' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyeleven' ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentyeleven' ), 'WordPress' ); ?></a>
+				<?php
+				if ( function_exists( 'the_privacy_policy_link' ) ) {
+					the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
+				}
+				?>
+				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyeleven' ) ); ?>" class="imprint" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyeleven' ); ?>">
+					<?php printf( __( 'Proudly powered by %s', 'twentyeleven' ), 'WordPress' ); ?>
+				</a>
 			</div>
 	</footer><!-- #colophon -->
 </div><!-- #page -->
diff --git a/wp-content/themes/twentyeleven/style.css b/wp-content/themes/twentyeleven/style.css
index 83e6f7a522..194f6b0db5 100644
--- a/wp-content/themes/twentyeleven/style.css
+++ b/wp-content/themes/twentyeleven/style.css
@@ -2352,6 +2352,12 @@ p.comment-form-comment {
 	color: #555;
 	font-weight: bold;
 }
+#site-generator span[role=separator] {
+	padding: 0 0.25em 0 0.5em
+}
+#site-generator span[role=separator]::before {
+	content: '\007c';
+}
 
 
 /* =Responsive Structure
diff --git a/wp-content/themes/twentyfifteen/footer.php b/wp-content/themes/twentyfifteen/footer.php
index e57b5f583a..6447da0e1d 100644
--- a/wp-content/themes/twentyfifteen/footer.php
+++ b/wp-content/themes/twentyfifteen/footer.php
@@ -22,7 +22,14 @@
 				 */
 				do_action( 'twentyfifteen_credits' );
 			?>
-			<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfifteen' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentyfifteen' ), 'WordPress' ); ?></a>
+			<?php
+			if ( function_exists( 'the_privacy_policy_link' ) ) {
+				the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
+			}
+			?>
+			<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfifteen' ) ); ?>" class="imprint">
+				<?php printf( __( 'Proudly powered by %s', 'twentyfifteen' ), 'WordPress' ); ?>
+			</a>
 		</div><!-- .site-info -->
 	</footer><!-- .site-footer -->
 
diff --git a/wp-content/themes/twentyfifteen/style.css b/wp-content/themes/twentyfifteen/style.css
index 77c731163b..70b65265a0 100644
--- a/wp-content/themes/twentyfifteen/style.css
+++ b/wp-content/themes/twentyfifteen/style.css
@@ -2434,6 +2434,13 @@ a.post-thumbnail:focus {
 	color: #333;
 }
 
+.site-info span[role=separator] {
+	padding: 0 0.25em 0 0.5em;
+}
+
+.site-info span[role=separator]::before {
+	content: '\002f';
+}
 
 /**
  * 14.0 Media
diff --git a/wp-content/themes/twentyfourteen/footer.php b/wp-content/themes/twentyfourteen/footer.php
index 0193c64777..d1016eb96a 100644
--- a/wp-content/themes/twentyfourteen/footer.php
+++ b/wp-content/themes/twentyfourteen/footer.php
@@ -18,7 +18,14 @@
 
 			<div class="site-info">
 				<?php do_action( 'twentyfourteen_credits' ); ?>
-				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfourteen' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentyfourteen' ), 'WordPress' ); ?></a>
+				<?php
+				if ( function_exists( 'the_privacy_policy_link' ) ) {
+					the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
+				}
+				?>
+				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfourteen' ) ); ?>" class="imprint">
+					<?php printf( __( 'Proudly powered by %s', 'twentyfourteen' ), 'WordPress' ); ?>
+				</a>
 			</div><!-- .site-info -->
 		</footer><!-- #colophon -->
 	</div><!-- #page -->
diff --git a/wp-content/themes/twentyfourteen/rtl.css b/wp-content/themes/twentyfourteen/rtl.css
index 5ff7312cbe..d765ee425f 100644
--- a/wp-content/themes/twentyfourteen/rtl.css
+++ b/wp-content/themes/twentyfourteen/rtl.css
@@ -355,6 +355,14 @@ td {
 	margin: -1px 0 0 18px;
 }
 
+/**
+ * 8.0 Footer
+ * -----------------------------------------------------------------------------
+ */
+
+.site-info span[role=separator] {
+	padding: 0 0.5em;
+}
 
 /**
  * 9.0 Featured Content
@@ -855,4 +863,4 @@ td {
 		margin-left: -18%;
 		margin-right: auto;
 	}
-}
\ No newline at end of file
+}
diff --git a/wp-content/themes/twentyfourteen/style.css b/wp-content/themes/twentyfourteen/style.css
index 32ed8373ae..800cf1ec64 100644
--- a/wp-content/themes/twentyfourteen/style.css
+++ b/wp-content/themes/twentyfourteen/style.css
@@ -2916,6 +2916,13 @@ a.post-thumbnail:hover {
 	color: #41a62a;
 }
 
+.site-info span[role=separator] {
+	padding: 0 0.25em 0 0.5em;
+}
+
+.site-info span[role=separator]::before {
+	content: '\002f';
+}
 
 /**
  * 9.0 Featured Content
diff --git a/wp-content/themes/twentyseventeen/style.css b/wp-content/themes/twentyseventeen/style.css
index beafdee296..fc9c306b3f 100644
--- a/wp-content/themes/twentyseventeen/style.css
+++ b/wp-content/themes/twentyseventeen/style.css
@@ -2378,6 +2378,14 @@ body:not(.twentyseventeen-front-page) .entry-header {
 	width: 100%;
 }
 
+.site-info span[role=separator] {
+	padding: 0 0.2em 0 0.4em;
+}
+
+.site-info span[role=separator]::before {
+	content: '\002f';
+}
+
 /*--------------------------------------------------------------
 14.0 Comments
 --------------------------------------------------------------*/
diff --git a/wp-content/themes/twentyseventeen/template-parts/footer/site-info.php b/wp-content/themes/twentyseventeen/template-parts/footer/site-info.php
index 8455dc4235..2f528efb1b 100644
--- a/wp-content/themes/twentyseventeen/template-parts/footer/site-info.php
+++ b/wp-content/themes/twentyseventeen/template-parts/footer/site-info.php
@@ -10,5 +10,12 @@
 
 ?>
 <div class="site-info">
-	<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyseventeen' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentyseventeen' ), 'WordPress' ); ?></a>
+	<?php
+	if ( function_exists( 'the_privacy_policy_link' ) ) {
+		the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
+	}
+	?>
+	<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyseventeen' ) ); ?>" class="imprint">
+		<?php printf( __( 'Proudly powered by %s', 'twentyseventeen' ), 'WordPress' ); ?>
+	</a>
 </div><!-- .site-info -->
diff --git a/wp-content/themes/twentysixteen/footer.php b/wp-content/themes/twentysixteen/footer.php
index 037633a98d..5fff3bd91a 100644
--- a/wp-content/themes/twentysixteen/footer.php
+++ b/wp-content/themes/twentysixteen/footer.php
@@ -52,7 +52,14 @@
 					do_action( 'twentysixteen_credits' );
 				?>
 				<span class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span>
-				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentysixteen' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentysixteen' ), 'WordPress' ); ?></a>
+				<?php
+				if ( function_exists( 'the_privacy_policy_link' ) ) {
+					the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
+				}
+				?>
+				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentysixteen' ) ); ?>" class="imprint">
+					<?php printf( __( 'Proudly powered by %s', 'twentysixteen' ), 'WordPress' ); ?>
+				</a>
 			</div><!-- .site-info -->
 		</footer><!-- .site-footer -->
 	</div><!-- .site-inner -->
diff --git a/wp-content/themes/twentysixteen/rtl.css b/wp-content/themes/twentysixteen/rtl.css
index f88041a2c3..8e91190da9 100644
--- a/wp-content/themes/twentysixteen/rtl.css
+++ b/wp-content/themes/twentysixteen/rtl.css
@@ -98,7 +98,8 @@ textarea,
 .site-footer .site-title,
 .site-footer .site-title:after,
 .widecolumn label,
-.widecolumn .mu_register label {
+.widecolumn .mu_register label,
+.site-footer span[role=separator] {
 	font-family: Arial, Tahoma, sans-serif;
 }
 
@@ -400,16 +401,6 @@ body:not(.search-results) .entry-summary .alignleft {
 }
 
 
-/**
- * 8.4 - Footer
- */
-
-.site-footer .site-title:after {
-	padding-right: 0.538461538em;
-	padding-left: 0.307692308em;
-}
-
-
 /**
  * 9.0 - Multisites
  */
diff --git a/wp-content/themes/twentysixteen/style.css b/wp-content/themes/twentysixteen/style.css
index ed22828698..0b615fd947 100644
--- a/wp-content/themes/twentysixteen/style.css
+++ b/wp-content/themes/twentysixteen/style.css
@@ -2443,6 +2443,16 @@ body.search-no-results .page-header {
 	padding: 0 0.307692308em 0 0.538461538em;
 }
 
+.site-footer span[role=separator] {
+	font-family: Montserrat, sans-serif;
+	opacity: 0.7;
+	padding: 0 0.307692308em 0 0.538461538em;
+}
+
+.site-footer span[role=separator]::before {
+	content: '\002f';
+}
+
 
 /**
  * 12.0 - Media
diff --git a/wp-content/themes/twentyten/footer.php b/wp-content/themes/twentyten/footer.php
index bb32687930..4763e99abd 100644
--- a/wp-content/themes/twentyten/footer.php
+++ b/wp-content/themes/twentyten/footer.php
@@ -27,6 +27,11 @@
 				<a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
 					<?php bloginfo( 'name' ); ?>
 				</a>
+				<?php
+				if ( function_exists( 'the_privacy_policy_link' ) ) {
+					the_privacy_policy_link( '<span role="separator" aria-hidden="true"></span>', '' );
+				}
+				?>
 			</div><!-- #site-info -->
 
 			<div id="site-generator">
@@ -38,7 +43,9 @@
 				 */
 				do_action( 'twentyten_credits' );
 				?>
-				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyten' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyten' ); ?>"><?php printf( __( 'Proudly powered by %s.', 'twentyten' ), 'WordPress' ); ?></a>
+				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyten' ) ); ?>" class="imprint" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyten' ); ?>">
+					<?php printf( __( 'Proudly powered by %s.', 'twentyten' ), 'WordPress' ); ?>
+				</a>
 			</div><!-- #site-generator -->
 
 		</div><!-- #colophon -->
diff --git a/wp-content/themes/twentyten/style.css b/wp-content/themes/twentyten/style.css
index d73dadd075..01654382f4 100644
--- a/wp-content/themes/twentyten/style.css
+++ b/wp-content/themes/twentyten/style.css
@@ -1318,6 +1318,12 @@ img#wpstats {
 	display: block;
 	margin: 0 auto 10px;
 }
+#site-info span[role=separator] {
+	padding: 0 0.6em 0 0.3em;
+}
+#site-info span[role=separator]::before {
+	content: '\007c';
+}
 
 
 /* =Mobile Safari ( iPad, iPhone and iPod Touch )
diff --git a/wp-content/themes/twentythirteen/footer.php b/wp-content/themes/twentythirteen/footer.php
index 37eef9b332..858f110b5a 100644
--- a/wp-content/themes/twentythirteen/footer.php
+++ b/wp-content/themes/twentythirteen/footer.php
@@ -16,7 +16,14 @@
 
 			<div class="site-info">
 				<?php do_action( 'twentythirteen_credits' ); ?>
-				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentythirteen' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentythirteen' ), 'WordPress' ); ?></a>
+				<?php
+				if ( function_exists( 'the_privacy_policy_link' ) ) {
+					the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
+				}
+				?>
+				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentythirteen' ) ); ?>" class="imprint">
+					<?php printf( __( 'Proudly powered by %s', 'twentythirteen' ), 'WordPress' ); ?>
+				</a>
 			</div><!-- .site-info -->
 		</footer><!-- #colophon -->
 	</div><!-- #page -->
diff --git a/wp-content/themes/twentythirteen/rtl.css b/wp-content/themes/twentythirteen/rtl.css
index 5c5657649f..1cafc3d27d 100644
--- a/wp-content/themes/twentythirteen/rtl.css
+++ b/wp-content/themes/twentythirteen/rtl.css
@@ -567,6 +567,9 @@ div.nav-menu > ul {
 	margin-right: auto;
 }
 
+.site-footer span[role=separator] {
+	padding: 0 0.5em;
+}
 
 /**
  * 8.0 Media Queries
@@ -769,4 +772,4 @@ div.nav-menu > ul {
 		margin-left: 0;
 		margin-right: auto;
 	}
-}
\ No newline at end of file
+}
diff --git a/wp-content/themes/twentythirteen/style.css b/wp-content/themes/twentythirteen/style.css
index 1506934978..135a7090d2 100644
--- a/wp-content/themes/twentythirteen/style.css
+++ b/wp-content/themes/twentythirteen/style.css
@@ -2705,6 +2705,13 @@ footer.entry-meta {
 	margin: -10px auto 0;
 }
 
+.site-footer span[role=separator] {
+	padding: 0 0.25em 0 0.5em;
+}
+
+.site-footer span[role=separator]::before {
+	content: '\002f';
+}
 
 /**
  * 8.0 Media Queries
diff --git a/wp-content/themes/twentytwelve/footer.php b/wp-content/themes/twentytwelve/footer.php
index b65e115d34..05e52e2bd8 100644
--- a/wp-content/themes/twentytwelve/footer.php
+++ b/wp-content/themes/twentytwelve/footer.php
@@ -13,7 +13,14 @@
 	<footer id="colophon" role="contentinfo">
 		<div class="site-info">
 			<?php do_action( 'twentytwelve_credits' ); ?>
-			<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentytwelve' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentytwelve' ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' ); ?></a>
+			<?php
+			if ( function_exists( 'the_privacy_policy_link' ) ) {
+				the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
+			}
+			?>
+			<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentytwelve' ) ); ?>" class="imprint" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentytwelve' ); ?>">
+				<?php printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' ); ?>
+			</a>
 		</div><!-- .site-info -->
 	</footer><!-- #colophon -->
 </div><!-- #page -->
diff --git a/wp-content/themes/twentytwelve/style.css b/wp-content/themes/twentytwelve/style.css
index 9c4dce365b..6f12539997 100644
--- a/wp-content/themes/twentytwelve/style.css
+++ b/wp-content/themes/twentytwelve/style.css
@@ -694,6 +694,12 @@ footer[role="contentinfo"] a {
 footer[role="contentinfo"] a:hover {
 	color: #21759b;
 }
+.site-info span[role=separator] {
+	padding: 0 0.3em 0 0.6em;
+}
+.site-info span[role=separator]::before {
+	content: '\002f';
+}
 
 
 /* =Main content and comment content
diff --git a/wp-includes/version.php b/wp-includes/version.php
index db1bf691ac..a541c4660d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-43050';
+$wp_version = '5.0-alpha-43051';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.