Changeset 43381

Timestamp:

06/26/2018 03:04:26 PM (6 years ago)

Author:

flixos90

Message:

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.

Location:

trunk

Files:

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

trunk/src/wp-admin/includes/dashboard.php

@@ -38 +38 @@
     // 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' );

trunk/src/wp-includes/capabilities.php

@@ -555 +555 @@
             }
             break;
-        case 'upgrade_php':
+        case 'update_php':
             if ( is_multisite() && ! is_super_admin( $user_id ) ) {
                 $caps[] = 'do_not_allow';

trunk/tests/phpunit/tests/user/capabilities.php

@@ -218 +218 @@
     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(),
-
-            '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' ),
+            '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' ),
+            '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' ),
-
-            'assign_categories'      => array( 'administrator', 'editor', 'author', 'contributor' ),
-            'assign_post_tags'       => array( 'administrator', 'editor', 'author', 'contributor' ),
+            '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' ),
         );
     }
@@ -256 +256 @@
     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(),
-
-            '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' ),
-
-            'assign_categories'      => array( 'administrator', 'editor', 'author', 'contributor' ),
-            'assign_post_tags'       => array( 'administrator', 'editor', 'author', 'contributor' ),
+            'manage_privacy_options'      => array(),
+
+            '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' ),
+
+            'assign_categories'           => array( 'administrator', 'editor', 'author', 'contributor' ),
+            'assign_post_tags'            => array( 'administrator', 'editor', 'author', 'contributor' ),
         );
     }