Changeset 16097

Timestamp:

10/30/2010 06:14:15 AM (16 years ago)

Author:

nacin

Message:

Fix nested HTML in submit_button(). fixes #15257, see #15064.

File:

• trunk/wp-admin/includes/template.php (modified) (1 diff)

trunk/wp-admin/includes/template.php

@@ -2150 +2150 @@
         
         // Default the id attribute to $name unless an id was specifically provided in $other_attributes
-        $id = 'id="' . esc_attr( $name ) . '" ';
-        if ( is_array( $other_attributes ) && array_key_exists( 'id', $other_attributes ) ) {
-                $id = 'id="' . esc_attr( $other_attributes['id'] ) . '" ';
-        }
+        $id = $name;
+        if ( is_array( $other_attributes ) && isset( $other_attributes['id'] ) )
+                $id = $other_attributes['id'];
         
-        $button = '<input type="submit" name="' . esc_attr( $name ) . '" id="' . $id . '" class="' . esc_attr( $class );
+        $button = '<input type="submit" name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class );
         $button .= '" value="' . esc_attr( $text ) . '" ' . $attributes . ' />';