WordPress.org
Get WordPress

Make WordPress Core

Changeset 43156


Ignore:
Timestamp:
05/03/2018 07:34:21 PM (8 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:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/4.9

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

    r43153 r43156  
    257257        $submenu['options-general.php'][30] = array(__('Media'), 'manage_options', 'options-media.php');
    258258        $submenu['options-general.php'][40] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
    259         $submenu['options-general.php'][45] = array( __( 'Privacy' ), 'manage_privacy_policy', 'privacy.php' );
     259        $submenu['options-general.php'][45] = array( __( 'Privacy' ), 'manage_privacy_options', 'privacy.php' );
    260260
    261261$_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

    r43153 r43156  
    1010require_once( dirname( __FILE__ ) . '/admin.php' );
    1111
    12 if ( ! current_user_can( 'manage_privacy_policy' ) ) {
     12if ( ! current_user_can( 'manage_privacy_options' ) ) {
    1313        wp_die( __( 'Sorry, you are not allowed to manage privacy on this site.' ) );
    1414}
    … …  
    201201                                        <input type="hidden" name="action" value="create-privacy-page" />
    202202                                        <span>
    203                                                 <?php _e( 'Or create a new page:' ); ?> 
     203                                                <?php _e( 'Or create a new page:' ); ?>
    204204                                        </span>
    205205                                        <?php

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

    r43153 r43156  
    542542        case 'export_others_personal_data':
    543543        case 'erase_others_personal_data':
    544         case 'manage_privacy_policy':
     544        case 'manage_privacy_options':
    545545                $caps[] = is_multisite() ? 'manage_network' : 'manage_options';
    546546                break;

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

    r43153 r43156  
    239239                        'export_others_personal_data' => array( 'administrator' ),
    240240                        'erase_others_personal_data'  => array( 'administrator' ),
    241                         'manage_privacy_policy'       => array( 'administrator' ),
     241                        'manage_privacy_options'      => array( 'administrator' ),
    242242
    243243                        'edit_categories'        => array( 'administrator', 'editor' ),
    … …  
    273273                        'export_others_personal_data' => array( '' ),
    274274                        'erase_others_personal_data'  => array( '' ),
    275                         'manage_privacy_policy'       => array(),
     275                        'manage_privacy_options'       => array(),
    276276
    277277                        'customize'              => array( 'administrator' ),
Note: See TracChangeset for help on using the changeset viewer.