Changeset 13553

Timestamp:

03/02/2010 06:36:49 PM (15 years ago)

Author:

nacin

Message:

Add id argument to wp_dropdown_users() and wp_dropdown_categories(). props johnbillion. Ensure we're escaping name and id in wp_dropdown_users(). fixes #12132

Location:

trunk/wp-includes

Files:

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

trunk/wp-includes/category-template.php

@@ -315 +315 @@
  *     'depth' (int) - The max depth.
  *     'tab_index' (int) - Tab index for select element.
- *     'name' (string) - The name attribute value for selected element.
- *     'class' (string) - The class attribute value for selected element.
+ *     'name' (string) - The name attribute value for select element.
+ *     'id' (string) - The ID attribute value for select element. Defaults to name if omitted.
+ *     'class' (string) - The class attribute value for select element.
  *     'selected' (int) - Which category ID is selected.
  *
@@ -337 +338 @@
         'exclude' => '', 'echo' => 1,
         'selected' => 0, 'hierarchical' => 0,
-        'name' => 'cat', 'class' => 'postform',
-        'depth' => 0, 'tab_index' => 0,
-        'taxonomy' => 'category', 'hide_if_empty' => false
+        'name' => 'cat', 'id' => '',
+        'class' => 'postform', 'depth' => 0,
+        'tab_index' => 0, 'taxonomy' => 'category',
+        'hide_if_empty' => false
     );
 
@@ -358 +360 @@
 
     $categories = get_terms( $taxonomy, $r );
-    $name = esc_attr($name);
-    $class = esc_attr($class);
+    $name = esc_attr( $name );
+    $class = esc_attr( $class );
+    $id = $id ? esc_attr( $id ) : $name;
 
     if ( ! $r['hide_if_empty'] || ! empty($categories) )
-        $output = "<select name='$name' id='$name' class='$class' $tab_index_attribute>\n";
+        $output = "<select name='$name' id='$id' class='$class' $tab_index_attribute>\n";
     else
         $output = '';

trunk/wp-includes/user.php

@@ -404 +404 @@
  * <li>include - User IDs to include.</li>
  * <li>exclude - User IDs to exclude.</li>
- * <li>multi - Default is 'false'. Whether to skip the ID attribute on the 'select' element.</li>
+ * <li>multi - Default is 'false'. Whether to skip the ID attribute on the 'select' element. A 'true' value is overridden when id argument is set.</li>
  * <li>show - Default is 'display_name'. User table column to display. If the selected item is empty then the user_login will be displayed in parentesis</li>
  * <li>echo - Default is '1'. Whether to display or retrieve content.</li>
  * <li>selected - Which User ID is selected.</li>
  * <li>name - Default is 'user'. Name attribute of select element.</li>
+ * <li>id - Default is the value of the 'name' parameter. ID attribute of select element.</li>
  * <li>class - Class attribute of select element.</li>
  * <li>blog_id - ID of blog (Multisite only). Defaults to ID of current blog.</li>
@@ -427 +428 @@
         'show' => 'display_name', 'echo' => 1,
         'selected' => 0, 'name' => 'user', 'class' => '', 'blog_id' => $GLOBALS['blog_id'],
+        'id' => '',
     );
 
@@ -460 +462 @@
     $output = '';
     if ( !empty($users) ) {
-        $id = $multi ? "" : "id='$name'";
-
-        $output = "<select name='$name' $id class='$class'>\n";
+        $name = esc_attr( $name );
+        if ( $multi && ! $id )
+            $id = '';
+        else
+            $id = $id ? " id='" . esc_attr( $id ) . "'" : "id='$name'";
+
+        $output = "<select name='{$name}'{$id} class='$class'>\n";
 
         if ( $show_option_all )