sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Privacy: Revert [47269] for now to address side effects on Multisite installations.

Browse Source 
See #44176.

git-svn-id: https://develop.svn.wordpress.org/trunk@47280 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2020-02-11 21:46:54 +00:00
parent 1106d82f93
commit f97a60c9b7
6 changed files with 203 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/wp-admin/includes/schema.php
View File

@ -695,7 +695,6 @@ function populate_roles() {
populate_roles_270();
populate_roles_280();
populate_roles_300();
populate_roles_540();
}
/**
@ -924,27 +923,6 @@ function populate_roles_300() {
}
}
/**
* Create and modify WordPress roles for WordPress 5.4.0.
*
* @since 5.4.0
*/
function populate_roles_540() {
// Add the privacy caps to the Administrators.
$role = get_role( 'administrator' );
if ( ! empty( $role ) ) {
$role->add_cap( 'export_others_personal_data' );
$role->add_cap( 'erase_others_personal_data' );
$role->add_cap( 'manage_privacy_options' );
}
$role = get_role( 'editor' );
if ( ! empty( $role ) ) {
$role->add_cap( 'manage_privacy_options' );
}
}
if ( ! function_exists( 'install_network' ) ) :
/**
* Install Network.

20
src/wp-admin/includes/upgrade.php
View File

@ -834,10 +834,6 @@ function upgrade_all() {
upgrade_530();
}
if ( $wp_current_db_version < 47269 ) {
upgrade_540();
}
maybe_disable_link_manager();
maybe_disable_automattic_widgets();
@ -2158,22 +2154,6 @@ function upgrade_530() {
}
}
/**
* Executes changes made in WordPress 5.4.0.
*
* @ignore
* @since 5.4.0
*
* @global int $wp_current_db_version The old (current) database version.
*/
function upgrade_540() {
global $wp_current_db_version;
if ( $wp_current_db_version < 47269 ) {
populate_roles_540();
}
}
/**
* Executes network-level upgrade routines.
*

4
src/wp-admin/menu.php
View File

@ -289,10 +289,6 @@ if ( ! is_multisite() && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE )
}
$menu[80] = array( __( 'Settings' ), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
if ( current_user_can( 'manage_privacy_options' ) && ! current_user_can( 'manage_options' ) ) {
$menu[80] = array( __( 'Settings' ), 'manage_privacy_options', 'options-privacy.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
}
$submenu['options-general.php'][10] = array( _x( 'General', 'settings screen' ), 'manage_options', 'options-general.php' );
$submenu['options-general.php'][15] = array( __( 'Writing' ), 'manage_options', 'options-writing.php' );
$submenu['options-general.php'][20] = array( __( 'Reading' ), 'manage_options', 'options-reading.php' );

9
src/wp-includes/capabilities.php
View File

@ -132,7 +132,7 @@ function map_meta_cap( $cap, $user_id, ...$args ) {
* so deleting it should require that too.
*/
if ( (int) get_option( 'wp_page_for_privacy_policy' ) === $post->ID ) {
$caps[] = 'manage_privacy_options';
$caps = array_merge( $caps, map_meta_cap( 'manage_privacy_options', $user_id ) );
}
break;
@ -203,7 +203,7 @@ function map_meta_cap( $cap, $user_id, ...$args ) {
* so editing it should require that too.
*/
if ( (int) get_option( 'wp_page_for_privacy_policy' ) === $post->ID ) {
$caps[] = 'manage_privacy_options';
$caps = array_merge( $caps, map_meta_cap( 'manage_privacy_options', $user_id ) );
}
break;
@ -580,6 +580,11 @@ function map_meta_cap( $cap, $user_id, ...$args ) {
$caps[] = 'update_core';
}
break;
case 'export_others_personal_data':
case 'erase_others_personal_data':
case 'manage_privacy_options':
$caps[] = is_multisite() ? 'manage_network' : 'manage_options';
break;
default:
// Handle meta capabilities for custom post types.
global $post_type_meta_caps;

2
src/wp-includes/version.php
View File

@ -20,7 +20,7 @@ $wp_version = '5.4-alpha-46582-src';
*
* @global int $wp_db_version
*/
$wp_db_version = 47269;
$wp_db_version = 47018;
/**
* Holds the TinyMCE version.

14
tests/phpunit/tests/user/capabilities.php
View File

@ -105,10 +105,6 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
'resume_themes' => array( 'administrator' ),
'view_site_health_checks' => array( 'administrator' ),
'manage_privacy_options' => array( 'administrator', 'editor' ),
'export_others_personal_data' => array( 'administrator' ),
'erase_others_personal_data' => array( 'administrator' ),
'moderate_comments' => array( 'administrator', 'editor' ),
'manage_categories' => array( 'administrator', 'editor' ),
'edit_others_posts' => array( 'administrator', 'editor' ),
@ -180,10 +176,6 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
'update_themes' => array(),
'view_site_health_checks' => array(),
'manage_privacy_options' => array( 'administrator', 'editor' ),
'export_others_personal_data' => array( 'administrator' ),
'erase_others_personal_data' => array( 'administrator' ),
'edit_theme_options' => array( 'administrator' ),
'export' => array( 'administrator' ),
'import' => array( 'administrator' ),
@ -268,6 +260,9 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
'update_languages' => array( 'administrator' ),
'deactivate_plugins' => array( 'administrator' ),
'update_php' => array( 'administrator' ),
'export_others_personal_data' => array( 'administrator' ),
'erase_others_personal_data' => array( 'administrator' ),
'manage_privacy_options' => array( 'administrator' ),
'edit_categories' => array( 'administrator', 'editor' ),
'delete_categories' => array( 'administrator', 'editor' ),
@ -300,6 +295,9 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
'update_languages' => array(),
'deactivate_plugins' => array(),
'update_php' => array(),
'export_others_personal_data' => array( '' ),
'erase_others_personal_data' => array( '' ),
'manage_privacy_options' => array(),
'customize' => array( 'administrator' ),
'delete_site' => array( 'administrator' ),