From 2208412015356f53ab4d1be8fdf5c290ce417ebd Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 27 May 2019 02:39:46 +0000
Subject: [PATCH] Privacy: Remove reinstated `wp-admin/options-privacy.php`
 from `$_old_files`.

Fix WPCS violations in [45448].

See #43895.

git-svn-id: https://develop.svn.wordpress.org/trunk@45453 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/list-table.php  | 28 +++++++++++-----------
 src/wp-admin/includes/update-core.php |  1 -
 src/wp-admin/options-privacy.php      |  7 ------
 src/wp-admin/tools.php                | 34 +++++++++++++--------------
 4 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/src/wp-admin/includes/list-table.php b/src/wp-admin/includes/list-table.php
index fc9c789655..1c48ba4187 100644
--- a/src/wp-admin/includes/list-table.php
+++ b/src/wp-admin/includes/list-table.php
@@ -22,22 +22,22 @@
 function _get_list_table( $class, $args = array() ) {
 	$core_classes = array(
 		//Site Admin
-		'WP_Posts_List_Table'          => 'posts',
-		'WP_Media_List_Table'          => 'media',
-		'WP_Terms_List_Table'          => 'terms',
-		'WP_Users_List_Table'          => 'users',
-		'WP_Comments_List_Table'       => 'comments',
-		'WP_Post_Comments_List_Table'  => array( 'comments', 'post-comments' ),
-		'WP_Links_List_Table'          => 'links',
-		'WP_Plugin_Install_List_Table' => 'plugin-install',
-		'WP_Themes_List_Table'         => 'themes',
-		'WP_Theme_Install_List_Table'  => array( 'themes', 'theme-install' ),
-		'WP_Plugins_List_Table'        => 'plugins',
+		'WP_Posts_List_Table'                         => 'posts',
+		'WP_Media_List_Table'                         => 'media',
+		'WP_Terms_List_Table'                         => 'terms',
+		'WP_Users_List_Table'                         => 'users',
+		'WP_Comments_List_Table'                      => 'comments',
+		'WP_Post_Comments_List_Table'                 => array( 'comments', 'post-comments' ),
+		'WP_Links_List_Table'                         => 'links',
+		'WP_Plugin_Install_List_Table'                => 'plugin-install',
+		'WP_Themes_List_Table'                        => 'themes',
+		'WP_Theme_Install_List_Table'                 => array( 'themes', 'theme-install' ),
+		'WP_Plugins_List_Table'                       => 'plugins',
 
 		// Network Admin
-		'WP_MS_Sites_List_Table'  => 'ms-sites',
-		'WP_MS_Users_List_Table'  => 'ms-users',
-		'WP_MS_Themes_List_Table' => 'ms-themes',
+		'WP_MS_Sites_List_Table'                      => 'ms-sites',
+		'WP_MS_Users_List_Table'                      => 'ms-users',
+		'WP_MS_Themes_List_Table'                     => 'ms-themes',
 
 		// Privacy requests tables
 		'WP_Privacy_Data_Export_Requests_List_Table'  => 'privacy-data-export-requests',
diff --git a/src/wp-admin/includes/update-core.php b/src/wp-admin/includes/update-core.php
index d1282fa6e2..61d642dacc 100644
--- a/src/wp-admin/includes/update-core.php
+++ b/src/wp-admin/includes/update-core.php
@@ -536,7 +536,6 @@ $_old_files = array(
 	'wp-admin/images/screenshots/twitter-embed-1.png',
 	'wp-admin/images/screenshots/twitter-embed-2.png',
 	'wp-admin/js/utils.js',
-	'wp-admin/options-privacy.php',
 	'wp-app.php',
 	'wp-includes/class-wp-atom-server.php',
 	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css',
diff --git a/src/wp-admin/options-privacy.php b/src/wp-admin/options-privacy.php
index 01bdda816a..61e9569beb 100644
--- a/src/wp-admin/options-privacy.php
+++ b/src/wp-admin/options-privacy.php
@@ -145,11 +145,9 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 		);
 
 		$view_href = get_permalink( $privacy_policy_page_id );
-
 		?>
 		<p class="tools-privacy-edit"><strong>
 			<?php
-
 			if ( 'publish' === get_post_status( $privacy_policy_page_id ) ) {
 				printf(
 					/* translators: 1: URL to edit Privacy Policy page, 2: URL to view Privacy Policy page */
@@ -165,7 +163,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 					esc_url( $view_href )
 				);
 			}
-
 			?>
 		</strong></p>
 		<?php
@@ -173,7 +170,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	?>
 	<p>
 		<?php
-
 		printf(
 			/* translators: 1: Privacy Policy guide URL, 2: additional link attributes, 3: accessibility text */
 			__( 'Need help putting together your new Privacy Policy page? <a href="%1$s" %2$s>Check out our guide%3$s</a> for recommendations on what content to include, along with policies suggested by your plugins and theme.' ),
@@ -181,7 +177,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 			'',
 			''
 		);
-
 		?>
 	</p>
 
@@ -201,7 +196,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 			</th>
 			<td>
 				<?php
-				
 				$has_pages = (bool) get_posts(
 					array(
 						'post_type'      => 'page',
@@ -218,7 +212,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 					<form method="post" action="">
 						<input type="hidden" name="action" value="set-privacy-page" />
 						<?php
-						
 						wp_dropdown_pages(
 							array(
 								'name'              => 'page_for_privacy_policy',
diff --git a/src/wp-admin/tools.php b/src/wp-admin/tools.php
index 1186fea684..786d4cf62b 100644
--- a/src/wp-admin/tools.php
+++ b/src/wp-admin/tools.php
@@ -60,25 +60,25 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 <h1><?php echo esc_html( $title ); ?></h1>
 <?php
 
-	if ( current_user_can( 'import' ) ) :
-		$cats = get_taxonomy( 'category' );
-		$tags = get_taxonomy( 'post_tag' );
-		if ( current_user_can( $cats->cap->manage_terms ) || current_user_can( $tags->cap->manage_terms ) ) :
-			?>
-	<div class="card">
-		<h2 class="title"><?php _e( 'Categories and Tags Converter' ); ?></h2>
-		<p><?php printf( __( 'If you want to convert your categories to tags (or vice versa), use the <a href="%s">Categories and Tags Converter</a> available from the Import screen.' ), 'import.php' ); ?></p>
-	</div>
-			<?php
-	endif;
+if ( current_user_can( 'import' ) ) :
+	$cats = get_taxonomy( 'category' );
+	$tags = get_taxonomy( 'post_tag' );
+	if ( current_user_can( $cats->cap->manage_terms ) || current_user_can( $tags->cap->manage_terms ) ) :
+		?>
+		<div class="card">
+			<h2 class="title"><?php _e( 'Categories and Tags Converter' ); ?></h2>
+			<p><?php printf( __( 'If you want to convert your categories to tags (or vice versa), use the <a href="%s">Categories and Tags Converter</a> available from the Import screen.' ), 'import.php' ); ?></p>
+		</div>
+		<?php
 	endif;
+endif;
 
-	/**
-	 * Fires at the end of the Tools Administration screen.
-	 *
-	 * @since 2.8.0
-	 */
-	do_action( 'tool_box' );
+/**
+ * Fires at the end of the Tools Administration screen.
+ *
+ * @since 2.8.0
+ */
+do_action( 'tool_box' );
 
 ?>
 </div>