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

If `get_avatar_data()` is passed an empty value for the default avatar, we should be using the site's `avatar_default` option instead. 

See #21195

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


git-svn-id: http://core.svn.wordpress.org/trunk@31135 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2015-01-12 00:23:24 +00:00
parent 3d051df3c9
commit 34636a0e41
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/link-template.php
View File

@ -3413,7 +3413,7 @@ function get_avatar_data( $id_or_email, $args = null ) {
}
if ( empty( $args['default'] ) ) {
$args['default'] = 'mystery';
$args['default'] = get_option( 'avatar_default', 'mystery' );
}
switch ( $args['default'] ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-alpha-31153';
$wp_version = '4.2-alpha-31154';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.