Ticket #20824: capabilities.php.patch

src/wp-includes/capabilities.php

@@ -819 +819 @@
         }
 
         /**
+         * Whether user has role.
+         *
+         * @since 3.7.0
+         * @access public
+         *
+         * @param string $role Role name to search.
+         * @return bool True, if user has role; false, if user does not have role.
+         */
+        function has_role( $role ) {
+                if ( in_array($role, $this->roles) ) {
+                        return true;
+                }
+                
+                return false;
+        }
+
+        /**
          * Choose the maximum level the user has.
          *
          * Will compare the level from the $item parameter against the $max
@@ -906 +923 @@
         }
 
         /**
-         * Whether user has capability or role name.
+         * Whether user has capability.
          *
-         * This is useful for looking up whether the user has a specific role
-         * assigned to the user. The second optional parameter can also be used to
+         * The second optional parameter can also be used to
          * check for capabilities against a specific object, such as a post or user.
          *
          * @since 2.0.0
          * @access public
          *
-         * @param string|int $cap Capability or role name to search.
+         * @param string|int $cap Capability name to search.
          * @return bool True, if user has capability; false, if user does not have capability.
          */
         function has_cap( $cap ) {
@@ -1268 +1284 @@
 }
 
 /**
- * Whether current user has capability or role.
+ * Whether current user has capability.
  *
  * @since 2.0.0
  *
- * @param string $capability Capability or role name.
+ * @param string $capability Capability name.
  * @return bool
  */
 function current_user_can( $capability ) {
@@ -1288 +1304 @@
 }
 
 /**
- * Whether current user has a capability or role for a given blog.
+ * Whether current user has a capability for a given blog.
  *
  * @since 3.0.0
  *
  * @param int $blog_id Blog ID
- * @param string $capability Capability or role name.
+ * @param string $capability Capability.
  * @return bool
  */
 function current_user_can_for_blog( $blog_id, $capability ) {
@@ -1317 +1333 @@
 }
 
 /**
- * Whether author of supplied post has capability or role.
+ * Whether author of supplied post has capability.
  *
  * @since 2.9.0
  *
  * @param int|object $post Post ID or post object.
- * @param string $capability Capability or role name.
+ * @param string $capability Capability.
  * @return bool
  */
 function author_can( $post, $capability ) {
@@ -1341 +1357 @@
 }
 
 /**
- * Whether a particular user has capability or role.
+ * Whether a particular user has capability.
  *
  * @since 3.1.0
  *
  * @param int|object $user User ID or object.
- * @param string $capability Capability or role name.
+ * @param string $capability Capability.
  * @return bool
  */
 function user_can( $user, $capability ) {
@@ -1363 +1379 @@
 }
 
 /**
+ * Whether current user has role.
+ *
+ * @since 3.7.0
+ *
+ * @param string $role role name.
+ * @return bool
+ */
+function current_user_has_role( $role ) {
+        $current_user = wp_get_current_user();
+
+        if ( empty( $current_user ) )
+                return false;
+        
+        return $current_user->has_role( $role );
+}
+
+/**
  * Retrieve role object.
  *
  * @see WP_Roles::get_role() Uses method to retrieve role object.

tests/phpunit/tests/user/capabilities.php

@@ -667 +667 @@
 
                 wp_set_current_user( $old_uid );
         }
+        
+        function test_current_user_has_role() {
+                $user = new WP_User( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( $user->ID );
+                
+                $this->assertTrue(current_user_has_role('administrator'));
+                $this->assertFalse(current_user_has_role('subscriber'));
+        }
 }