WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Privacy: rename `manage_privacy_policy` to `manage_privacy_options`. 

Props desrosj.
Merges [43155] to the 4.9 branch.
Fixes #43935.
Built from https://develop.svn.wordpress.org/branches/4.9@43156


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42985 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2018-05-03 19:35:26 +00:00
parent b5dd35f036
commit 8aa3f8aa17
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/menu.php
View File

@ -256,7 +256,7 @@ $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '',
$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

4
wp-admin/privacy.php
View File

@ -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' );

2
wp-includes/capabilities.php
View File

@ -541,7 +541,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:

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9.6-alpha-43153';
$wp_version = '4.9.6-alpha-43156';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.