From 242709ce404d7a30b7c01851c7ee570eb4a3c471 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 11 Nov 2015 19:40:44 +0000
Subject: [PATCH] Users: Only show the profile picture if 'Show Avatars' option
 in Discussion Settings is enabled.

Props ocean90.
See #32286.

git-svn-id: https://develop.svn.wordpress.org/trunk@35613 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/user-edit.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php
index 12f9699d62..88d4657bba 100644
--- a/src/wp-admin/user-edit.php
+++ b/src/wp-admin/user-edit.php
@@ -437,6 +437,7 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
 	<p class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p></td>
 </tr>
 
+<?php if ( get_option( 'show_avatars' ) ) : ?>
 <tr class="user-profile-picture">
 	<th><?php _e( 'Profile Picture' ); ?></th>
 	<td>
@@ -462,6 +463,7 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
 		?></p>
 	</td>
 </tr>
+<?php endif; ?>
 
 <?php
 /**