From d399bcce30cb42aea6092092a962ddcb172cdf60 Mon Sep 17 00:00:00 2001 From: Felix Arntz Date: Tue, 26 Jun 2018 15:04:26 +0000 Subject: [PATCH] Role/Capability: Rename `upgrade_php` capability to more suitable `update_php`. This brings the name in line with user-facing language and similar names of existing related capabilities. Since the capability has not been part of any WordPress release, it can be renamed without any backward-compatibility implications. Also missing props benhuberman for [43006]. Fixes #44457. git-svn-id: https://develop.svn.wordpress.org/trunk@43381 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/dashboard.php | 2 +- src/wp-includes/capabilities.php | 2 +- tests/phpunit/tests/user/capabilities.php | 110 +++++++++++----------- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/wp-admin/includes/dashboard.php b/src/wp-admin/includes/dashboard.php index d61bb07a7a..0c5bb5f5b1 100644 --- a/src/wp-admin/includes/dashboard.php +++ b/src/wp-admin/includes/dashboard.php @@ -37,7 +37,7 @@ function wp_dashboard_setup() { // PHP Version. $response = wp_check_php_version(); - if ( $response && isset( $response['is_acceptable'] ) && ! $response['is_acceptable'] && current_user_can( 'upgrade_php' ) ) { + if ( $response && isset( $response['is_acceptable'] ) && ! $response['is_acceptable'] && current_user_can( 'update_php' ) ) { add_filter( 'postbox_classes_dashboard_dashboard_php_nag', 'dashboard_php_nag_class' ); wp_add_dashboard_widget( 'dashboard_php_nag', __( 'PHP Update Required' ), 'wp_dashboard_php_nag' ); } diff --git a/src/wp-includes/capabilities.php b/src/wp-includes/capabilities.php index e574b3f809..592995a120 100644 --- a/src/wp-includes/capabilities.php +++ b/src/wp-includes/capabilities.php @@ -554,7 +554,7 @@ function map_meta_cap( $cap, $user_id ) { $caps[] = 'manage_options'; } break; - case 'upgrade_php': + case 'update_php': if ( is_multisite() && ! is_super_admin( $user_id ) ) { $caps[] = 'do_not_allow'; } else { diff --git a/tests/phpunit/tests/user/capabilities.php b/tests/phpunit/tests/user/capabilities.php index 71cba002e0..bca1b432f8 100644 --- a/tests/phpunit/tests/user/capabilities.php +++ b/tests/phpunit/tests/user/capabilities.php @@ -217,77 +217,77 @@ class Tests_User_Capabilities extends WP_UnitTestCase { final private function _getSingleSiteMetaCaps() { return array( - 'create_sites' => array(), - 'delete_sites' => array(), - 'manage_network' => array(), - 'manage_sites' => array(), - 'manage_network_users' => array(), - 'manage_network_plugins' => array(), - 'manage_network_themes' => array(), - 'manage_network_options' => array(), - 'delete_site' => array(), - 'upgrade_network' => array(), + 'create_sites' => array(), + 'delete_sites' => array(), + 'manage_network' => array(), + 'manage_sites' => array(), + 'manage_network_users' => array(), + 'manage_network_plugins' => array(), + 'manage_network_themes' => array(), + 'manage_network_options' => array(), + 'delete_site' => array(), + 'upgrade_network' => array(), - 'setup_network' => array( 'administrator' ), - 'upload_plugins' => array( 'administrator' ), - 'upload_themes' => array( 'administrator' ), - 'customize' => array( 'administrator' ), - 'add_users' => array( 'administrator' ), - 'install_languages' => array( 'administrator' ), - 'update_languages' => array( 'administrator' ), - 'deactivate_plugins' => array( 'administrator' ), - 'upgrade_php' => array( 'administrator' ), + 'setup_network' => array( 'administrator' ), + 'upload_plugins' => array( 'administrator' ), + 'upload_themes' => array( 'administrator' ), + 'customize' => array( 'administrator' ), + 'add_users' => array( 'administrator' ), + 'install_languages' => array( 'administrator' ), + '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' ), - 'manage_post_tags' => array( 'administrator', 'editor' ), - 'edit_post_tags' => array( 'administrator', 'editor' ), - 'delete_post_tags' => array( 'administrator', 'editor' ), - 'edit_css' => array( 'administrator', 'editor' ), + 'edit_categories' => array( 'administrator', 'editor' ), + 'delete_categories' => array( 'administrator', 'editor' ), + 'manage_post_tags' => array( 'administrator', 'editor' ), + 'edit_post_tags' => array( 'administrator', 'editor' ), + 'delete_post_tags' => array( 'administrator', 'editor' ), + 'edit_css' => array( 'administrator', 'editor' ), - 'assign_categories' => array( 'administrator', 'editor', 'author', 'contributor' ), - 'assign_post_tags' => array( 'administrator', 'editor', 'author', 'contributor' ), + 'assign_categories' => array( 'administrator', 'editor', 'author', 'contributor' ), + 'assign_post_tags' => array( 'administrator', 'editor', 'author', 'contributor' ), ); } final private function _getMultiSiteMetaCaps() { return array( - 'create_sites' => array(), - 'delete_sites' => array(), - 'manage_network' => array(), - 'manage_sites' => array(), - 'manage_network_users' => array(), - 'manage_network_plugins' => array(), - 'manage_network_themes' => array(), - 'manage_network_options' => array(), - 'setup_network' => array(), - 'upload_plugins' => array(), - 'upload_themes' => array(), - 'edit_css' => array(), - 'upgrade_network' => array(), - 'install_languages' => array(), - 'update_languages' => array(), - 'deactivate_plugins' => array(), - 'upgrade_php' => array(), + 'create_sites' => array(), + 'delete_sites' => array(), + 'manage_network' => array(), + 'manage_sites' => array(), + 'manage_network_users' => array(), + 'manage_network_plugins' => array(), + 'manage_network_themes' => array(), + 'manage_network_options' => array(), + 'setup_network' => array(), + 'upload_plugins' => array(), + 'upload_themes' => array(), + 'edit_css' => array(), + 'upgrade_network' => array(), + 'install_languages' => array(), + 'update_languages' => array(), + 'deactivate_plugins' => array(), + 'update_php' => array(), 'export_others_personal_data' => array( '' ), 'erase_others_personal_data' => array( '' ), - 'manage_privacy_options' => array(), + 'manage_privacy_options' => array(), - 'customize' => array( 'administrator' ), - 'delete_site' => array( 'administrator' ), - 'add_users' => array( 'administrator' ), + 'customize' => array( 'administrator' ), + 'delete_site' => array( 'administrator' ), + 'add_users' => array( 'administrator' ), - 'edit_categories' => array( 'administrator', 'editor' ), - 'delete_categories' => array( 'administrator', 'editor' ), - 'manage_post_tags' => array( 'administrator', 'editor' ), - 'edit_post_tags' => array( 'administrator', 'editor' ), - 'delete_post_tags' => array( 'administrator', 'editor' ), + 'edit_categories' => array( 'administrator', 'editor' ), + 'delete_categories' => array( 'administrator', 'editor' ), + 'manage_post_tags' => array( 'administrator', 'editor' ), + 'edit_post_tags' => array( 'administrator', 'editor' ), + 'delete_post_tags' => array( 'administrator', 'editor' ), - 'assign_categories' => array( 'administrator', 'editor', 'author', 'contributor' ), - 'assign_post_tags' => array( 'administrator', 'editor', 'author', 'contributor' ), + 'assign_categories' => array( 'administrator', 'editor', 'author', 'contributor' ), + 'assign_post_tags' => array( 'administrator', 'editor', 'author', 'contributor' ), ); }