Ticket #46128: 46128.diff

src/wp-includes/class-wp-customize-manager.php

@@ -5316 +5316 @@
                         )
                 );
 
+                /*
+                 * If there is no custom header theme mod saved (or added via a filter)
+                 * but a random header image is going to display on the frontend, set
+                 * the 'header_image' default to 'random-default-image' to reflect that.
+                 * See #46128.
+                 */
+                $header_image_default = sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() );
+                if ( ! $header_image_default && is_random_header_image() ) {
+                        $header_image_default = 'random-default-image';
+                }
+
                 $this->add_setting(
                         new WP_Customize_Filter_Setting(
                                 $this,
                                 'header_image',
                                 array(
-                                        'default'        => sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() ),
+                                        'default'        => $header_image_default,
                                         'theme_supports' => 'custom-header',
                                 )
                         )