From 506a99ef30167563271042d345917bb306ec0aa6 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Wed, 2 May 2018 22:09:19 +0000
Subject: [PATCH] Privacy: do not fold a single section in the privacy policy
 poxtbox.

See #43473.

git-svn-id: https://develop.svn.wordpress.org/trunk@43126 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/edit.css      |  1 +
 src/wp-admin/includes/misc.php | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index b61e9a9ae3..e8fbcfde3b 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -717,6 +717,7 @@ span.wp-media-buttons-icon:before {
 }
 
 .privacy-text-actions {
+	height: 32px;
 	line-height: 32px;
 	padding-bottom: 6px;
 }
diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php
index 51f795a9df..5a710146fa 100644
--- a/src/wp-admin/includes/misc.php
+++ b/src/wp-admin/includes/misc.php
@@ -1586,15 +1586,17 @@ final class WP_Privacy_Policy_Content {
 			$content .= '<div class="policy-text" aria-expanded="false">' . $section['policy_text'] . '</div>';
 
 			$content .= '<div class="privacy-text-actions">';
-				$content .= '<button type="button" class="button-link policy-text-more">';
-					$content .= $more;
-					$content .= '<span class="screen-reader-text">' . sprintf( __( 'Expand suggested policy text section from %s.' ), $plugin_name ) . '</span>';
-				$content .= '</button>';
+				if ( $folded ) {
+					$content .= '<button type="button" class="button-link policy-text-more">';
+						$content .= $more;
+						$content .= '<span class="screen-reader-text">' . sprintf( __( 'Expand suggested policy text section from %s.' ), $plugin_name ) . '</span>';
+					$content .= '</button>';
 
-				$content .= '<button type="button" class="button-link policy-text-less">';
-					$content .= $less;
-					$content .= '<span class="screen-reader-text">' . sprintf( __( 'Collapse suggested policy text section from %s.' ), $plugin_name ) . '</span>';
-				$content .= '</button>';
+					$content .= '<button type="button" class="button-link policy-text-less">';
+						$content .= $less;
+						$content .= '<span class="screen-reader-text">' . sprintf( __( 'Collapse suggested policy text section from %s.' ), $plugin_name ) . '</span>';
+					$content .= '</button>';
+				}
 
 				if ( empty( $section['removed'] ) ) {
 					$content .= '<button type="button" class="privacy-text-copy button">';