From 88e669b6dbf2d9f5366b7df1f8bf03ec3b4188f7 Mon Sep 17 00:00:00 2001 From: Konstantin Obenland Date: Tue, 14 Jul 2015 15:39:25 +0000 Subject: [PATCH] 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 --- wp-admin/options-discussion.php | 4 +--- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php index 759d58c86d..2ddaaac330 100644 --- a/wp-admin/options-discussion.php +++ b/wp-admin/options-discussion.php @@ -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 = ''; diff --git a/wp-includes/version.php b/wp-includes/version.php index a039dea119..491df59d81 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -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.