Merge pull request #477 from pfefferle/improve/performance

Speeds up the loading of posts with lots of comments

Author: dshanske

includes/class-comment-walker.php

@@ -288,22 +288,14 @@ public static function comment_query( $query ) {
 			return;
 		}
 
-		if ( is_admin() ) {
+		if ( is_admin() || ! is_singular() ) {
 			return;
 		}
 
-		if ( ! is_singular() ) {
+		if ( ! empty( $query->query_vars['type__in'] ) ) {
 			return;
 		}
 
-		if ( ! empty( $query->query_vars['meta_query'] ) ) {
-			$query_vars = current( $query->query_vars['meta_query'] );
-
-			if ( ! empty( $query_vars['key'] ) && 'protocol' === $query_vars['key'] ) {
-				return;
-			}
-		}
-
 		if ( isset( $query->query_vars['count'] ) && true === $query->query_vars['count'] ) {
 			return;
 		}

templates/webmention-comments.php

@@ -3,12 +3,6 @@
 	array(
 		'post_id'    => get_the_ID(),
 		'type__in'   => get_webmention_comment_type_names(),
-		'meta_query' => array(
-			array(
-				'key'     => 'protocol',
-				'compare' => 'EXISTS',
-			),
-		),
 		'status'     => 'approve',
 	)
 );