From 1b2ff1d7e9ece5642d092bbb779cce2557c352cc Mon Sep 17 00:00:00 2001
From: Caleb Burks <caleb.burks@automattic.com>
Date: Wed, 15 Jan 2020 23:22:17 -0500
Subject: [PATCH 1/3] Add filter to hide email address in users list

---
 common/php/class-module.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/php/class-module.php b/common/php/class-module.php
index 25c94dc53..468adbc03 100644
--- a/common/php/class-module.php
+++ b/common/php/class-module.php
@@ -488,10 +488,10 @@ function users_select_form( $selected = null, $args = null ) {
 		if ( !is_array($selected) ) $selected = array();
 		?>
 
-		<?php if( !empty($users) ) : ?>
+		<?php if ( ! empty ( $users ) ) : ?>
 			<ul class="<?php echo esc_attr( $list_class ) ?>">
-				<?php foreach( $users as $user ) : 
-					$checked = ( in_array($user->ID, $selected) ) ? 'checked="checked"' : '';
+				<?php foreach( $users as $user ) :
+					$checked = ( in_array( $user->ID, $selected ) ) ? 'checked="checked"' : '';
 					// Add a class to checkbox of current user so we know not to add them in notified list during notifiedMessage() js function
 					$current_user_class = ( get_current_user_id() == $user->ID ) ? 'class="post_following_list-current_user" ' : '';
 				?>
@@ -503,7 +503,10 @@ function users_select_form( $selected = null, $args = null ) {
 							</div>
 
 							<span class="ef-user_displayname"><?php echo esc_html( $user->display_name ); ?></span>
-							<span class="ef-user_useremail"><?php echo esc_html( $user->user_email ); ?></span>
+
+							<?php if ( apply_filters( 'ef_users_select_form_show_email_address', true, $user ) ) : ?>
+								<span class="ef-user_useremail"><?php echo esc_html( $user->user_email ); ?></span>
+							<?php endif; ?>
 						</label>
 					</li>
 				<?php endforeach; ?>

From fce71fed92d2fc2fab3c33870246ef2132d4b5e7 Mon Sep 17 00:00:00 2001
From: Caleb Burks <caleb.burks@automattic.com>
Date: Wed, 15 Jan 2020 23:45:17 -0500
Subject: [PATCH 2/3] Prevent commenter email from displaying

---
 modules/editorial-comments/editorial-comments.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/editorial-comments/editorial-comments.php b/modules/editorial-comments/editorial-comments.php
index b08eae783..6f7d488b8 100644
--- a/modules/editorial-comments/editorial-comments.php
+++ b/modules/editorial-comments/editorial-comments.php
@@ -295,7 +295,7 @@ function the_comment($comment, $args, $depth) {
 			<div class="post-comment-wrap">
 				<h5 class="comment-meta">
 					<?php printf( __('<span class="comment-author">%1$s</span><span class="meta"> said on %2$s at %3$s</span>', 'edit-flow'),
-							comment_author_email_link( $comment->comment_author ),
+							esc_html( $comment->comment_author ),
 							get_comment_date( get_option( 'date_format' ) ),
 							get_comment_time() ); ?>
 				</h5>

From a8723b832a8bc4b1c925b5c5ba7bd16830940770 Mon Sep 17 00:00:00 2001
From: Caleb Burks <caleb.burks@automattic.com>
Date: Thu, 16 Jan 2020 00:14:38 -0500
Subject: [PATCH 3/3] Use same filter to control email display

---
 common/php/class-module.php                       | 2 +-
 modules/editorial-comments/editorial-comments.php | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/php/class-module.php b/common/php/class-module.php
index 468adbc03..95842ab5d 100644
--- a/common/php/class-module.php
+++ b/common/php/class-module.php
@@ -504,7 +504,7 @@ function users_select_form( $selected = null, $args = null ) {
 
 							<span class="ef-user_displayname"><?php echo esc_html( $user->display_name ); ?></span>
 
-							<?php if ( apply_filters( 'ef_users_select_form_show_email_address', true, $user ) ) : ?>
+							<?php if ( apply_filters( 'ef_display_user_email_address', true, $user->ID ) ) : ?>
 								<span class="ef-user_useremail"><?php echo esc_html( $user->user_email ); ?></span>
 							<?php endif; ?>
 						</label>
diff --git a/modules/editorial-comments/editorial-comments.php b/modules/editorial-comments/editorial-comments.php
index 6f7d488b8..e267030a7 100644
--- a/modules/editorial-comments/editorial-comments.php
+++ b/modules/editorial-comments/editorial-comments.php
@@ -286,6 +286,10 @@ function the_comment($comment, $args, $depth) {
 			}
 		}
 
+		$escaped_comment_author = esc_html( $comment->comment_author );
+		if ( apply_filters( 'ef_display_user_email_address', true, $comment->user_id ) ) {
+			$escaped_comment_author = get_comment_author_email_link( $comment->comment_author );
+		}
 	?>
 
 		<li id="comment-<?php echo esc_attr( $comment->comment_ID ); ?>" <?php comment_class( array( 'comment-item', wp_get_comment_status($comment->comment_ID) ) ); ?>>
@@ -295,7 +299,7 @@ function the_comment($comment, $args, $depth) {
 			<div class="post-comment-wrap">
 				<h5 class="comment-meta">
 					<?php printf( __('<span class="comment-author">%1$s</span><span class="meta"> said on %2$s at %3$s</span>', 'edit-flow'),
-							esc_html( $comment->comment_author ),
+							$escaped_comment_author,
 							get_comment_date( get_option( 'date_format' ) ),
 							get_comment_time() ); ?>
 				</h5>