From a7fcbcae89b993f30f2c9fccf3fe149dcf5f3778 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Thu, 3 May 2018 19:30:49 +0000
Subject: [PATCH] Privacy: rename `manage_privacy_policy` to
 `manage_privacy_options`.

Props desrosj.
FIxes #43935.

git-svn-id: https://develop.svn.wordpress.org/trunk@43155 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/menu.php                     | 2 +-
 src/wp-admin/privacy.php                  | 4 ++--
 src/wp-includes/capabilities.php          | 2 +-
 tests/phpunit/tests/user/capabilities.php | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/wp-admin/menu.php b/src/wp-admin/menu.php
index fd49433208..0ad302ebda 100644
--- a/src/wp-admin/menu.php
+++ b/src/wp-admin/menu.php
@@ -270,7 +270,7 @@ $menu[80]                               = array( __( 'Settings' ), 'manage_optio
 	$submenu['options-general.php'][25] = array( __( 'Discussion' ), 'manage_options', 'options-discussion.php' );
 	$submenu['options-general.php'][30] = array( __( 'Media' ), 'manage_options', 'options-media.php' );
 	$submenu['options-general.php'][40] = array( __( 'Permalinks' ), 'manage_options', 'options-permalink.php' );
-	$submenu['options-general.php'][45] = array( __( 'Privacy' ), 'manage_privacy_policy', 'privacy.php' );
+	$submenu['options-general.php'][45] = array( __( 'Privacy' ), 'manage_privacy_options', 'privacy.php' );
 
 $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group
 
diff --git a/src/wp-admin/privacy.php b/src/wp-admin/privacy.php
index 399467e229..d1e20f767b 100644
--- a/src/wp-admin/privacy.php
+++ b/src/wp-admin/privacy.php
@@ -9,7 +9,7 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_privacy_policy' ) ) {
+if ( ! current_user_can( 'manage_privacy_options' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage privacy on this site.' ) );
 }
 
@@ -200,7 +200,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 				<form method="post" action="">
 					<input type="hidden" name="action" value="create-privacy-page" />
 					<span>
-						<?php _e( 'Or create a new page:' ); ?> 
+						<?php _e( 'Or create a new page:' ); ?>
 					</span>
 					<?php
 					wp_nonce_field( 'create-privacy-page' );
diff --git a/src/wp-includes/capabilities.php b/src/wp-includes/capabilities.php
index eb7ee7b138..530fe563d8 100644
--- a/src/wp-includes/capabilities.php
+++ b/src/wp-includes/capabilities.php
@@ -557,7 +557,7 @@ function map_meta_cap( $cap, $user_id ) {
 			break;
 		case 'export_others_personal_data':
 		case 'erase_others_personal_data':
-		case 'manage_privacy_policy':
+		case 'manage_privacy_options':
 			$caps[] = is_multisite() ? 'manage_network' : 'manage_options';
 			break;
 		default:
diff --git a/tests/phpunit/tests/user/capabilities.php b/tests/phpunit/tests/user/capabilities.php
index 9e8d5d78fa..71cba002e0 100644
--- a/tests/phpunit/tests/user/capabilities.php
+++ b/tests/phpunit/tests/user/capabilities.php
@@ -239,7 +239,7 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
 			'upgrade_php'            => array( 'administrator' ),
 			'export_others_personal_data' => array( 'administrator' ),
 			'erase_others_personal_data'  => array( 'administrator' ),
-			'manage_privacy_policy'       => array( 'administrator' ),
+			'manage_privacy_options'      => array( 'administrator' ),
 
 			'edit_categories'        => array( 'administrator', 'editor' ),
 			'delete_categories'      => array( 'administrator', 'editor' ),
@@ -274,7 +274,7 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
 			'upgrade_php'            => array(),
 			'export_others_personal_data' => array( '' ),
 			'erase_others_personal_data'  => array( '' ),
-			'manage_privacy_policy'       => array(),
+			'manage_privacy_options'       => array(),
 
 			'customize'              => array( 'administrator' ),
 			'delete_site'            => array( 'administrator' ),