Changeset 24491

Timestamp:

06/21/2013 01:01:55 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Correct return value for get_role() and WP_Roles::get_role(). props tivnet. fixes #24607.

File:

• trunk/wp-includes/capabilities.php (modified) (4 diffs)

trunk/wp-includes/capabilities.php

@@ -159 +159 @@
      * @param string $display_name Role display name.
      * @param array $capabilities List of role capabilities in the above format.
-     * @return null|WP_Role WP_Role object if role is added, null if already exists.
+     * @return WP_Role|null WP_Role object if role is added, null if already exists.
      */
     function add_role( $role, $display_name, $capabilities = array() ) {
@@ -240 +240 @@
      *
      * @param string $role Role name.
-     * @return object|null Null, if role does not exist. WP_Role object, if found.
+     * @return WP_Role|null WP_Role object if found, null if the role does not exist.
      */
     function get_role( $role ) {
@@ -1375 +1375 @@
  *
  * @param string $role Role name.
- * @return object
+ * @return WP_Role|null WP_Role object if found, null if the role does not exist.
  */
 function get_role( $role ) {
@@ -1395 +1395 @@
  * @param string $display_name Display name for role.
  * @param array $capabilities List of capabilities, e.g. array( 'edit_posts' => true, 'delete_posts' => false );
- * @return null|WP_Role WP_Role object if role is added, null if already exists.
+ * @return WP_Role|null WP_Role object if role is added, null if already exists.
  */
 function add_role( $role, $display_name, $capabilities = array() ) {