Ticket #32192: html-attributes.diff

wp-admin/includes/template.php

@@ -1900 +1900 @@
 
         $attributes = '';
         if ( is_array( $other_attributes ) ) {
-                foreach ( $other_attributes as $attribute => $value ) {
-                        $attributes .= $attribute . '="' . esc_attr( $value ) . '" '; // Trailing space is important
-                }
+                $attributes = get_html_attrs( $other_attributes );
         } elseif ( ! empty( $other_attributes ) ) { // Attributes provided as a string
-                $attributes = $other_attributes;
+                $attributes = ' ' . $other_attributes;
         }
 
-        // Don't output empty name and id attributes.
-        $name_attr = $name ? ' name="' . esc_attr( $name ) . '"' : '';
-        $id_attr = $id ? ' id="' . esc_attr( $id ) . '"' : '';
+        $attrs = array(
+                'type'    => 'submit',
+                'name'    => $name,
+                'id'      => $id,
+                'class'   => $class,
+                'value'   => $text,
+        );
 
-        $button = '<input type="submit"' . $name_attr . $id_attr . ' class="' . esc_attr( $class );
-        $button .= '" value="' . esc_attr( $text ) . '" ' . $attributes . ' />';
+        $button = '<input' . get_html_attrs( $attrs ) . $attributes . ' />';
 
         if ( $wrap ) {
                 $button = '<p class="submit">' . $button . '</p>';

wp-includes/comment-template.php

@@ -1282 +1282 @@
         $id = get_the_ID();
         $title = get_the_title();
         $number = get_comments_number( $id );
+        
+        $class_attr = get_html_attrs( array( 'class' => $css_class ) );
 
         if ( false === $zero ) {
                 /* translators: %s: post title */
@@ -1305 +1307 @@
         }
 
         if ( 0 == $number && !comments_open() && !pings_open() ) {
-                echo '<span' . ((!empty($css_class)) ? ' class="' . esc_attr( $css_class ) . '"' : '') . '>' . $none . '</span>';
+                echo '<span' . $class_attr . '>' . $none . '</span>';
                 return;
         }
 
@@ -1330 +1332 @@
                 echo '"';
         }
 
-        if ( !empty( $css_class ) ) {
-                echo ' class="'.$css_class.'" ';
+        if ( $class_attr ) {
+                echo $class_attr . ' '; 
         }
 
         $attributes = '';

wp-includes/functions.php

@@ -4845 +4845 @@
                 @unlink( $delete );
         }
 }
+
+/**
+ * Get HTML attributes.
+ *
+ * @since 4.3.0
+ *
+ * @param array $attrs 
+ * @return string 
+ */
+function html_attributes( $attrs ) {
+        if ( ! is_array( $attrs ) ) {
+                return false;
+        }
+        
+        $html = array();
+        
+        foreach ( (array) $attrs as $attr => $value ) {
+                if ( is_numeric( $attr ) ) {
+                        $attr = $value;
+                }
+                
+                if ( ! empty( $value ) ) {
+                        $value = 'href' == $attr ? esc_url( $value ) : esc_attr( $value );
+                        
+                        $html[] = $attr . '="' . $value . '"';
+                }
+        }
+
+        return count( $html ) > 0 ? ' ' . implode( ' ', $html ) : '';
+}

wp-includes/media.php

@@ -758 +758 @@
                  * @param string|array $size       Requested size.
                  */
                 $attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment, $size );
-                $attr = array_map( 'esc_attr', $attr );
-                $html = rtrim("<img $hwstring");
-                foreach ( $attr as $name => $value ) {
-                        $html .= " $name=" . '"' . $value . '"';
-                }
-                $html .= ' />';
+
+                $html = '<img ' . rtrim( $hwstring ) . html_attributes( $attr ) . ' />';
         }
 
         return $html;
@@ -879 +875 @@
         if ( $atts['width'] < 1 || empty( $atts['caption'] ) )
                 return $content;
 
-        if ( ! empty( $atts['id'] ) )
-                $atts['id'] = 'id="' . esc_attr( $atts['id'] ) . '" ';
-
-        $class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
-
+        $attrs = array(
+                'id'      => $atts['id'],
+                'style'   => 'width: ' . (int) $atts['width'] . 'px;',
+                'class'   => trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] )
+        );
+        
         if ( current_theme_supports( 'html5', 'caption' ) ) {
-                return '<figure ' . $atts['id'] . 'style="width: ' . (int) $atts['width'] . 'px;" class="' . esc_attr( $class ) . '">'
+                return '<figure' . get_html_attrs( $attrs ) . '>' 
                 . do_shortcode( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>';
         }
 
@@ -909 +906 @@
         $caption_width = apply_filters( 'img_caption_shortcode_width', $caption_width, $atts, $content );
 
         $style = '';
-        if ( $caption_width )
-                $style = 'style="width: ' . (int) $caption_width . 'px" ';
-
-        return '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
+        
+        if ( $caption_width ) {
+                $attrs['style'] = 'width: ' . (int) $caption_width . 'px;';
+        }
+        return '<div' . get_html_attrs( $attrs ) . '>'
         . do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>';
 }
 
@@ -1641 +1639 @@
                 }
         }
 
-        $attr_strings = array();
-        foreach ( $html_atts as $k => $v ) {
-                $attr_strings[] = $k . '="' . esc_attr( $v ) . '"';
-        }
-
         $html = '';
         if ( 'mediaelement' === $library && 1 === $instance ) {
                 $html .= "<!--[if lt IE 9]><script>document.createElement('audio');</script><![endif]-->\n";
         }
-        $html .= sprintf( '<audio %s controls="controls">', join( ' ', $attr_strings ) );
-
+        $html .= '<audio %s controls="controls"' . html_attributes( $html_atts ) . '>';
+        
         $fileurl = '';
         $source = '<source type="%s" src="%s" />';
         foreach ( $default_types as $fallback ) {

wp-includes/nav-menu-template.php

@@ -140 +140 @@
                  */
                 $atts = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args, $depth );
 
-                $attributes = '';
-                foreach ( $atts as $attr => $value ) {
-                        if ( ! empty( $value ) ) {
-                                $value = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
-                                $attributes .= ' ' . $attr . '="' . $value . '"';
-                        }
-                }
-
                 $item_output = $args->before;
-                $item_output .= '<a'. $attributes .'>';
+                $item_output .= '<a' . html_attributes( $atts ) . '>';
                 /** This filter is documented in wp-includes/post-template.php */
                 $item_output .= $args->link_before . apply_filters( 'the_title', $item->title, $item->ID ) . $args->link_after;
                 $item_output .= '</a>';