Ticket #30783: 30783.diff

pluggable.php

@@ -2292 +2292 @@
         if ( ! $args['found_avatar'] || $args['force_default'] ) {
                 $class[] = 'avatar-default';
         }
+        if ( current_theme_suports( 'microformats2' ) ) {
+                $class[] = 'u-photo';
+        }
 
         if ( $args['class'] ) {
                 if ( is_array( $args['class'] ) ) {

post-template.php

@@ -466 +466 @@
                         $classes[] = 'status-sticky';
                 }
         }
+        // Backward compatibility for old behavior.
+        if ( ! current_theme_supports( 'microformats2' ) ) {
+                // hentry for hAtom compliance
+                $classes[] = 'hentry';
+        }
+        else {
+                // Add Microformats 2 on pages that contain multiple hentry/h-entrys.
+                if ( ! is_single() ) {
+                        $classes[] = 'h-entry';
+                        $classes[] = 'hentry';
+                }
+        }
 
-        // hentry for hAtom compliance
-        $classes[] = 'hentry';
-
         // All public taxonomies
         $taxonomies = get_taxonomies( array( 'public' => true ) );
         foreach ( (array) $taxonomies as $taxonomy ) {
@@ -563 +572 @@
         if ( is_single() ) {
                 $post_id = $wp_query->get_queried_object_id();
                 $post = $wp_query->get_queried_object();
-
                 $classes[] = 'single';
                 if ( isset( $post->post_type ) ) {
                         $classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
@@ -705 +713 @@
                 elseif ( is_post_type_archive() )
                         $classes[] = 'post-type-paged-' . $page;
         }
+        // Support Microformats2 behavior.
+        if ( current_theme_supports( 'microformats2' ) ) {
+                if ( is_single() ) {
+                        $classes[] = 'h-entry';
+                        $classes[] = 'hentry';
+                }
+                else {
+                        $classes[] = 'h-feed';
+                        $classes[] = 'hfeed';
+    }
+        }
 
         if ( ! empty( $class ) ) {
                 if ( !is_array( $class ) )

comment-template.php

@@ -209 +209 @@
                 $return = $author;
         else
                 $return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
+                if ( current_theme_supports( 'microformats2' ) ) {
+                        $return = "<a href='$url' rel='external nofollow' class='url u-url'>$author</a>";
+                }
 
         /**
          * Filter the comment author's link for display.
@@ -428 +431 @@
         // Get the comment type (comment, trackback),
         $classes[] = ( empty( $comment->comment_type ) ) ? 'comment' : $comment->comment_type;
 
+        // Microformats2 Support.
+        if ( current_theme_supports( 'microformats2' ) ) {
+                $classes[] = 'p-comment';
+                $classes[] = 'h-entry';
+        }
+
         // Add classes for comment authors that are registered users.
         if ( $comment->user_id > 0 && $user = get_userdata( $comment->user_id ) ) {
                 $classes[] = 'byuser';