Ticket #23746: 23746.3.diff

src/wp-includes/capabilities-functions.php

@@ -442 +442 @@
 function wp_roles() {
         global $wp_roles;
 
+
+
         if ( ! isset( $wp_roles ) ) {
                 $wp_roles = new WP_Roles();
         }
@@ -471 +473 @@
  * @return WP_Role|null WP_Role object if role is added, null if already exists.
  */
 function add_role( $role, $display_name, $capabilities = array() ) {
+
+        if ( empty( $role ) ) {
+                return;
+        }
+
         return wp_roles()->add_role( $role, $display_name, $capabilities );
 }
 

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

@@ -172 +172 @@
          * @return WP_Role|void WP_Role object, if role is added.
          */
         public function add_role( $role, $display_name, $capabilities = array() ) {
-                if ( isset( $this->roles[$role] ) )
+
+                if ( empty( $role ) || isset( $this->roles[$role] ) ) {
                         return;
+                }
 
                 $this->roles[$role] = array(
                         'name' => $display_name,

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

@@ -436 +436 @@
          * @param string $role Role name.
          */
         public function add_role( $role ) {
+
+                if ( empty( $role ) ) {
+                        return;
+                }
+
                 $this->caps[$role] = true;
                 update_user_meta( $this->ID, $this->cap_key, $this->caps );
                 $this->get_role_caps();