From fbc98b8e7573caed4d191db33c9d45e09f1831e2 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Thu, 3 May 2018 19:31:21 +0000
Subject: [PATCH] Privacy: rename `manage_privacy_policy` to
 `manage_privacy_options`.

Props desrosj.
FIxes #43935.
Built from https://develop.svn.wordpress.org/trunk@43155


git-svn-id: http://core.svn.wordpress.org/trunk@42984 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/menu.php            | 2 +-
 wp-admin/privacy.php         | 4 ++--
 wp-includes/capabilities.php | 2 +-
 wp-includes/version.php      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index fd49433208..0ad302ebda 100644
--- a/wp-admin/menu.php
+++ b/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/wp-admin/privacy.php b/wp-admin/privacy.php
index 399467e229..d1e20f767b 100644
--- a/wp-admin/privacy.php
+++ b/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/wp-includes/capabilities.php b/wp-includes/capabilities.php
index eb7ee7b138..530fe563d8 100644
--- a/wp-includes/capabilities.php
+++ b/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/wp-includes/version.php b/wp-includes/version.php
index d4f6a6c36c..ef6840dca5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-43154';
+$wp_version = '5.0-alpha-43155';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.