Ticket #14578: garyc40.14578.diff

wp-admin/includes/template.php

@@ -759 +759 @@
  * @param string $selected slug for the role that should be already selected
  */
 function wp_dropdown_roles( $selected = false ) {
-        $p = '';
         $r = '';
 
-        $editable_roles = get_editable_roles();
+        $editable_roles = array_reverse(get_editable_roles());
 
         foreach ( $editable_roles as $role => $details ) {
                 $name = translate_user_role($details['name'] );
                 if ( $selected == $role ) // preselect specified role
-                        $p = "\n\t<option selected='selected' value='" . esc_attr($role) . "'>$name</option>";
+                        $r .= "\n\t<option selected='selected' value='" . esc_attr($role) . "'>$name</option>";
                 else
                         $r .= "\n\t<option value='" . esc_attr($role) . "'>$name</option>";
         }
-        echo $p . $r;
+        echo $r;
 }
 
 /**

wp-admin/options-general.php

@@ -113 +113 @@
 </fieldset></td>
 </tr>
 <tr valign="top">
-<th scope="row"><label for="default_role"><?php _e('New User Default Role') ?></label></th>
+<th scope="row"><label for="default_role"><?php _e('New User Default Role'); ?></label></th>
 <td>
 <select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select>
 </td>

wp-includes/capabilities.php

@@ -166 +166 @@
 
                 if ( $this->use_db )
                         update_option( $this->role_key, $this->roles );
+                
+                if ( get_option( 'default_role' ) == $role )
+                        update_option( 'default_role', 'subscriber' );
         }
 
         /**
@@ -206 +209 @@
          * @access public
          *
          * @param string $role Role name.
-         * @return object|null Null, if role does not exist. WP_Role object, if found.
+         * @return object|null empty object, if role does not exist. WP_Role object, if found.
          */
         function &get_role( $role ) {
-                if ( isset( $this->role_objects[$role] ) )
+                if ( isset( $this->role_objects[$role] ) ) {
                         return $this->role_objects[$role];
-                else
-                        return null;
+                }
+                else {
+                        $obj = null; // prevent invalid variable reference notice
+                        return $obj;
+                }
         }
 
         /**
@@ -1118 +1124 @@
  * @param string $role Role name.
  * @return object
  */
-function get_role( $role ) {
+function &get_role( $role ) {
         global $wp_roles;
 
         if ( ! isset( $wp_roles ) )

wp-includes/default-filters.php

@@ -172 +172 @@
 add_filter( 'option_blog_charset',  '_wp_specialchars'                    ); // IMPORTANT: This must not be wp_specialchars() or esc_html() or it'll cause an infinite loop
 add_filter( 'option_home',          '_config_wp_home'                     );
 add_filter( 'option_siteurl',       '_config_wp_siteurl'                  );
+add_filter( 'option_default_role',  '_wp_filter_verify_default_role'      );
 add_filter( 'tiny_mce_before_init', '_mce_set_direction'                  );
 add_filter( 'pre_kses',             'wp_pre_kses_less_than'               );
 add_filter( 'sanitize_title',       'sanitize_title_with_dashes'          );

wp-includes/functions.php

@@ -4471 +4471 @@
         return false;
 }
 
+function _wp_filter_verify_default_role( $role ) {
+        $role_obj = get_role( $role );
+        if ( empty( $role_obj ) )
+                $role = 'subscriber';
+        return $role;
+}
 ?>