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

wp-includes/link-template.php

@@ -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'] ) {

wp-includes/version.php

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