Changeset 43156

Timestamp:

05/03/2018 07:34:21 PM (6 years ago)

Author:

azaozz

Message:

Privacy: rename manage_privacy_policy to manage_privacy_options.

Props desrosj.
Merges [43155] to the 4.9 branch.
Fixes #43935.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/menu.php (modified) (1 diff)
• src/wp-admin/privacy.php (modified) (2 diffs)
• src/wp-includes/capabilities.php (modified) (1 diff)
• tests/phpunit/tests/user/capabilities.php (modified) (2 diffs)

branches/4.9/src/wp-admin/menu.php

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

branches/4.9/src/wp-admin/privacy.php

@@ -10 +10 @@
 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.' ) );
 }
@@ -201 +201 @@
                     <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

branches/4.9/src/wp-includes/capabilities.php

@@ -542 +542 @@
     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;

branches/4.9/tests/phpunit/tests/user/capabilities.php

@@ -239 +239 @@
             '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' ),
@@ -273 +273 @@
             'export_others_personal_data' => array( '' ),
             'erase_others_personal_data'  => array( '' ),
-            'manage_privacy_policy'       => array(),
+            'manage_privacy_options'       => array(),
 
             'customize'              => array( 'administrator' ),