Changeset 28564

Timestamp:

05/23/2014 08:46:18 PM (11 years ago)

Author:

wonderboymusic

Message:

wp_dropdown_pages() allows option_none_value to be passed. Add that arg to the $defaults for wp_dropdown_users() and wp_dropdown_categories() as well.

Props solarissmoke.
Fixes #16625.

Location:

trunk/src/wp-includes

Files:

• category-template.php (modified) (4 diffs)
• user.php (modified) (3 diffs)

trunk/src/wp-includes/category-template.php

@@ -332 +332 @@
         'class' => 'postform', 'depth' => 0,
         'tab_index' => 0, 'taxonomy' => 'category',
-        'hide_if_empty' => false
+        'hide_if_empty' => false, 'option_none_value' => -1
     );
 
@@ -344 +344 @@
 
     $r = wp_parse_args( $args, $defaults );
+    $option_none_value = $r['option_none_value'];
 
     if ( ! isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
@@ -382 +383 @@
          */
         $show_option_none = apply_filters( 'list_cats', $r['show_option_none'] );
-        $output .= "\t<option value='-1' selected='selected'>$show_option_none</option>\n";
+        $output .= "\t<option value='" . esc_attr( $option_none_value ) . "' selected='selected'>$show_option_none</option>\n";
     }
 
@@ -399 +400 @@
             /** This filter is documented in wp-includes/category-template.php */
             $show_option_none = apply_filters( 'list_cats', $r['show_option_none'] );
-            $selected = ( '-1' === strval($r['selected']) ) ? " selected='selected'" : '';
-            $output .= "\t<option value='-1'$selected>$show_option_none</option>\n";
+            $selected = selected( $option_none_value, $r['selected'], false );
+            $output .= "\t<option value='" . esc_attr( $option_none_value ) . "'$selected>$show_option_none</option>\n";
         }
 

trunk/src/wp-includes/user.php

@@ -1286 +1286 @@
         'show' => 'display_name', 'echo' => 1,
         'selected' => 0, 'name' => 'user', 'class' => '', 'id' => '',
-        'blog_id' => $GLOBALS['blog_id'], 'who' => '', 'include_selected' => false
+        'blog_id' => $GLOBALS['blog_id'], 'who' => '', 'include_selected' => false,
+        'option_none_value' => -1
     );
 
@@ -1295 +1296 @@
     $show_option_all = $r['show_option_all'];
     $show_option_none = $r['show_option_none'];
+    $option_none_value = $r['option_none_value'];
 
     $query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order', 'who' ) );
@@ -1315 +1317 @@
 
         if ( $show_option_none ) {
-            $_selected = selected( -1, $r['selected'], false );
-            $output .= "\t<option value='-1'$_selected>$show_option_none</option>\n";
+            $_selected = selected( $option_none_value, $r['selected'], false );
+            $output .= "\t<option value='" . esc_attr( $option_none_value ) . "'$_selected>$show_option_none</option>\n";
         }