Changeset 33967

Timestamp:

09/09/2015 03:41:27 AM (9 years ago)

Author:

wonderboymusic

Message:

Ensure that role is not empty before adding it in add_role() function and methods.

Props MikeHansenMe, dannydehaan, michielhab.
Fixes #23746.

Location:

trunk/src/wp-includes

Files:

• capabilities-functions.php (modified) (1 diff)
• class-wp-roles.php (modified) (1 diff)
• class-wp-user.php (modified) (1 diff)

trunk/src/wp-includes/capabilities-functions.php

@@ -472 +472 @@
  */
 function add_role( $role, $display_name, $capabilities = array() ) {
+    if ( empty( $role ) ) {
+        return;
+    }
     return wp_roles()->add_role( $role, $display_name, $capabilities );
 }

trunk/src/wp-includes/class-wp-roles.php

@@ -173 +173 @@
      */
     public function add_role( $role, $display_name, $capabilities = array() ) {
-        if ( isset( $this->roles[$role] ) )
-            return;
+        if ( empty( $role ) || isset( $this->roles[ $role ] ) ) {
+            return;
+        }
 
         $this->roles[$role] = array(

trunk/src/wp-includes/class-wp-user.php

@@ -440 +440 @@
      */
     public function add_role( $role ) {
+        if ( empty( $role ) ) {
+            return;
+        }
+
         $this->caps[$role] = true;
         update_user_meta( $this->ID, $this->cap_key, $this->caps );