From a5b157ffdeb987974e45f372f3204548ae241462 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Mon, 31 Aug 2015 21:09:21 +0000 Subject: [PATCH] Remove the hamburger global'ing from [33828]: since no args are passed to `comment_author_email_link()`, the internals can be simplified and applied inline. See #11566. Built from https://develop.svn.wordpress.org/trunk@33829 git-svn-id: http://core.svn.wordpress.org/trunk@33797 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-comments-list-table.php | 10 +++++----- wp-includes/version.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php index 95e6ab30fb..d1d518240f 100644 --- a/wp-admin/includes/class-wp-comments-list-table.php +++ b/wp-admin/includes/class-wp-comments-list-table.php @@ -652,11 +652,11 @@ class WP_Comments_List_Table extends WP_List_Table { } if ( $this->user_can ) { - if ( !empty( $comment->comment_author_email ) ) { - $GLOBALS['comment'] = $comment; - comment_author_email_link(); - echo '
'; - unset( $GLOBALS['comment'] ); + if ( ! empty( $comment->comment_author_email ) ) { + $email = apply_filters( 'comment_email', $comment->comment_author_email, $comment ); + if ( ! empty( $email ) && '@' !== $email ) { + printf( '%1$s
', $email ); + } } $author_ip = get_comment_author_IP( $comment->comment_ID ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 93f8a269a5..d77b360a06 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-33828'; +$wp_version = '4.4-alpha-33829'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.