From 6c40c6f2e2d37af39f95d869e55fb648e3a5e75a Mon Sep 17 00:00:00 2001 From: Peter Westwood Date: Mon, 24 Nov 2014 10:51:22 +0000 Subject: [PATCH] Fix the passing of commenter cookie data to the comment API so that we don't try and fetch all unapproved comments for users with no-email address when we only have an author. Fixes #19623 Built from https://develop.svn.wordpress.org/trunk@30547 git-svn-id: http://core.svn.wordpress.org/trunk@30536 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/comment-template.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index 67a2095c20..1377f3cc05 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -1160,7 +1160,7 @@ function comments_template( $file = '/comments.php', $separate_comments = false if ( $user_ID ) { $comment_args['include_unapproved'] = array( $user_ID ); - } else if ( ! empty( $comment_author ) ) { + } else if ( ! empty( $comment_author_email ) ) { $comment_args['include_unapproved'] = array( $comment_author_email ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 84a5cd54f6..c06f3c0adf 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30546'; +$wp_version = '4.1-beta2-30547'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.