Ticket #43935: 43935.2.diff

src/wp-admin/menu.php

@@ -270 +270 @@
         $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
 

src/wp-admin/privacy.php

@@ -9 +9 @@
 /** 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 +200 @@
                                 <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' );

src/wp-includes/capabilities.php

@@ -557 +557 @@
                         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:

tests/phpunit/tests/user/capabilities.php

@@ -239 +239 @@
                         '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 +274 @@
                         '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' ),