Changeset 16568

Timestamp:

11/24/2010 04:30:40 PM (13 years ago)

Author:

markjaquith

Message:

Do not double up on id attribute for submit_button() if id is provided in other attributes param. props duck_. see #15064

File:

• trunk/wp-admin/includes/template.php (modified) (2 diffs)

trunk/wp-admin/includes/template.php

@@ -2121 +2121 @@
     $text = ( NULL == $text ) ? __( 'Save Changes' ) : $text;
 
+    // Default the id attribute to $name unless an id was specifically provided in $other_attributes
+    $id = $name;
+    if ( is_array( $other_attributes ) && isset( $other_attributes['id'] ) ) {
+        $id = $other_attributes['id'];
+        unset( $other_attributes['id'] );
+    }
+
     $attributes = '';
     if ( is_array( $other_attributes ) ) {
@@ -2130 +2137 @@
     }
 
-    // Default the id attribute to $name unless an id was specifically provided in $other_attributes
-    $id = $name;
-    if ( is_array( $other_attributes ) && isset( $other_attributes['id'] ) )
-        $id = $other_attributes['id'];
-
     $button = '<input type="submit" name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class );
     $button .= '" value="' . esc_attr( $text ) . '" ' . $attributes . ' />';