Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use default parameter when getting the default avatar type. 

Props johnjamesjacoby.
Fixes #32997.

Built from https://develop.svn.wordpress.org/trunk@33264


git-svn-id: http://core.svn.wordpress.org/trunk@33236 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Konstantin Obenland 2015-07-14 15:39:25 +00:00
parent 542e01162f
commit 88e669b6db
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/options-discussion.php
View File

@ -258,9 +258,7 @@ $avatar_defaults = array(
* @param array $avatar_defaults Array of default avatars.
*/
$avatar_defaults = apply_filters( 'avatar_defaults', $avatar_defaults );
$default = get_option('avatar_default');
if ( empty($default) )
$default = 'mystery';
$default = get_option( 'avatar_default', 'mystery' );
$size = 32;
$avatar_list = '';

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-beta2-33263';
$wp_version = '4.3-beta2-33264';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.