Changeset 9230 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php

Timestamp:

10/24/2019 06:54:36 AM (5 years ago)

Author:

dd32

Message:

Plugin Directory: Fix some HTML validation errors.

• Remove duplicate ID's
• Don't nest <style> under <a>

See #4730.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php

@@ -503 +503 @@
 
         switch ( $output ) {
+            case 'html-parts':
             case 'html':
-                $id    = "plugin-icon-{$plugin->post_name}";
-                $html  = "<style type='text/css'>";
-                $html .= "#{$id} { background-image: url('{$icon}'); }";
+                $id         = esc_attr( "plugin-icon-{$plugin->post_name}" );
+                $style_tag  = "<style type='text/css'>";
+                $style_tag .= ".{$id} { background-image: url('{$icon}'); }";
                 if ( ! empty( $icon_2x ) && ! $generated && ! $svg ) {
-                    $html .= "@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { #{$id} { background-image: url('{$icon_2x}'); } }";
-                }
-                $html .= '</style>';
-                $html .= "<div class='plugin-icon' id='{$id}'></div>";
-
-                return $html;
+                    $style_tag .= "@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { .{$id} { background-image: url('{$icon_2x}'); } }";
+                }
+                $style_tag .= '</style>';
+
+                $icon_tag   = "<div class='plugin-icon {$id}'></div>";
+
+                if ( 'html' === $output ) {
+                    return $style_tag . $icon_tag;
+                } else {
+                    return compact( 'style_tag', 'icon_tag' );
+                }
                 break;