Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-23 21:34:57 +02:00
Code Issues Projects Releases Wiki Activity

Users: Only show the profile picture if 'Show Avatars' option in Discussion Settings is enabled.

Browse Source 
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
This commit is contained in:
Sergey Biryukov 2015-11-11 19:41:25 +00:00
parent 5403b62a6a
commit d206e633c2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/user-edit.php
View File

@ -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
/**

2
wp-includes/version.php
View File

@ -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.