From d206e633c23d635b1aa4de14deceb36a05505459 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 11 Nov 2015 19:41:25 +0000
Subject: [PATCH] Users: Only show the profile picture if 'Show Avatars' option
 in Discussion Settings is enabled.

Props ocean90.
See #32286.
Built from https://develop.svn.wordpress.org/trunk@35613


git-svn-id: http://core.svn.wordpress.org/trunk@35577 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/user-edit.php  | 2 ++
 wp-includes/version.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 12f9699d62..88d4657bba 100644
--- a/wp-admin/user-edit.php
+++ b/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
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 70ce6ac5f7..fa807cded1 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta3-35612';
+$wp_version = '4.4-beta3-35613';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.