Changeset 45028

Timestamp:

03/27/2019 12:15:15 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Themes: Remove itemprop="url" from get_custom_logo() output.

Making incorrect assumptions about microdata used in a theme results in invalid markup.

The attribute can still be added using the get_custom_logo or wp_get_attachment_image_attributes filter, but it should not be added by default.

Props henry.wright, tfrommen, afercia, markcallen, zodiac1978.
Fixes #37305.

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (2 diffs)
• tests/phpunit/tests/general/template.php (modified) (5 diffs)

trunk/src/wp-includes/general-template.php

@@ -949 +949 @@
     if ( $custom_logo_id ) {
         $custom_logo_attr = array(
-            'class'    => 'custom-logo',
-            'itemprop' => 'logo',
+            'class' => 'custom-logo',
         );
 
@@ -967 +966 @@
          */
         $html = sprintf(
-            '<a href="%1$s" class="custom-logo-link" rel="home" itemprop="url">%2$s</a>',
+            '<a href="%1$s" class="custom-logo-link" rel="home">%2$s</a>',
             esc_url( home_url( '/' ) ),
             wp_get_attachment_image( $custom_logo_id, 'full', false, $custom_logo_attr )

trunk/tests/phpunit/tests/general/template.php

@@ -309 +309 @@
 
         $custom_logo_attr = array(
-            'class'    => 'custom-logo',
-            'itemprop' => 'logo',
+            'class' => 'custom-logo',
         );
 
@@ -323 +322 @@
         restore_current_blog();
 
-        $expected_custom_logo = '<a href="' . $home_url . '" class="custom-logo-link" rel="home" itemprop="url">' . $image . '</a>';
+        $expected_custom_logo = '<a href="' . $home_url . '" class="custom-logo-link" rel="home">' . $image . '</a>';
         $this->assertEquals( $expected_custom_logo, get_custom_logo( $blog_id ) );
     }
@@ -339 +338 @@
 
         $custom_logo_attr = array(
-            'class'    => 'custom-logo',
-            'itemprop' => 'logo',
+            'class' => 'custom-logo',
         );
 
@@ -351 +349 @@
         $image = wp_get_attachment_image( $this->custom_logo_id, 'full', false, $custom_logo_attr );
 
-        $this->expectOutputString( '<a href="http://' . WP_TESTS_DOMAIN . '/" class="custom-logo-link" rel="home" itemprop="url">' . $image . '</a>' );
+        $this->expectOutputString( '<a href="http://' . WP_TESTS_DOMAIN . '/" class="custom-logo-link" rel="home">' . $image . '</a>' );
         the_custom_logo();
     }
@@ -371 +369 @@
             false,
             array(
-                'class'    => 'custom-logo',
-                'itemprop' => 'logo',
+                'class' => 'custom-logo',
             )
         );
 
-        $this->expectOutputString( '<a href="http://' . WP_TESTS_DOMAIN . '/" class="custom-logo-link" rel="home" itemprop="url">' . $image . '</a>' );
+        $this->expectOutputString( '<a href="http://' . WP_TESTS_DOMAIN . '/" class="custom-logo-link" rel="home">' . $image . '</a>' );
         the_custom_logo();
     }